8edad8f7a3
Library order is important because it is used to construct class loader
context, which is then written into OAT/ODEX files and chacked against
class loader context constructed by PackageManager on the device. If the
orders are different, dexpreopted code is rejected.
This CL fixes a few problems that caused reordering:
- 'filter' function arguments are swapped so that patterns list comes
first, and the library list second
- JSON representation of class loader context is changed to avoid
unmarshaling it to Go maps, which may reorder keys
- library list is no longer sorted (it's unclear why it was sorted)
Bug: 132357300
Test: lunch cf_x86_64_phone-userdebug && m && launch_cvd \
adb wait-for-device && adb root && adb logcat \
| grep -E 'ClassLoaderContext [a-z ]+ mismatch'
# empty grep output, no errors
Change-Id: Ie76996d497e60da0948f1879d6db589ff3e968a2
39 lines
2.2 KiB
Makefile
39 lines
2.2 KiB
Makefile
4space :=$= $(space)$(space)$(space)$(space)
|
|
invert_bool =$= $(if $(strip $(1)),,true)
|
|
|
|
# Converts a list to a JSON list.
|
|
# $1: List separator.
|
|
# $2: List.
|
|
_json_list =$= [$(if $(2),"$(subst $(1),"$(comma)",$(2))")]
|
|
|
|
# Converts a space-separated list to a JSON list.
|
|
json_list =$= $(call _json_list,$(space),$(1))
|
|
|
|
# Converts a comma-separated list to a JSON list.
|
|
csv_to_json_list =$= $(call _json_list,$(comma),$(1))
|
|
|
|
# Adds or removes 4 spaces from _json_indent
|
|
json_increase_indent =$= $(eval _json_indent := $$(_json_indent)$$(4space))
|
|
json_decrease_indent =$= $(eval _json_indent := $$(subst _,$$(space),$$(patsubst %____,%,$$(subst $$(space),_,$$(_json_indent)))))
|
|
|
|
# 1: Key name
|
|
# 2: Value
|
|
add_json_val =$= $(eval _json_contents := $$(_json_contents)$$(_json_indent)"$$(strip $$(1))": $$(strip $$(2))$$(comma)$$(newline))
|
|
add_json_str =$= $(call add_json_val,$(1),"$(strip $(2))")
|
|
add_json_list =$= $(call add_json_val,$(1),$(call json_list,$(patsubst %,%,$(2))))
|
|
add_json_csv =$= $(call add_json_val,$(1),$(call csv_to_json_list,$(strip $(2))))
|
|
add_json_bool =$= $(call add_json_val,$(1),$(if $(strip $(2)),true,false))
|
|
add_json_map =$= $(eval _json_contents := $$(_json_contents)$$(_json_indent)"$$(strip $$(1))": {$$(newline))$(json_increase_indent)
|
|
add_json_map_anon =$= $(eval _json_contents := $$(_json_contents)$$(_json_indent){$$(newline))$(json_increase_indent)
|
|
end_json_map =$= $(json_decrease_indent)$(eval _json_contents := $$(_json_contents)$$(if $$(filter %$$(comma),$$(lastword $$(_json_contents))),__SV_END)$$(_json_indent)},$$(newline))
|
|
add_json_array =$= $(eval _json_contents := $$(_json_contents)$$(_json_indent)"$$(strip $$(1))": [$$(newline))$(json_increase_indent)
|
|
end_json_array =$= $(json_decrease_indent)$(eval _json_contents := $$(_json_contents)$$(if $$(filter %$$(comma),$$(lastword $$(_json_contents))),__SV_END)$$(_json_indent)],$$(newline))
|
|
|
|
# Clears _json_contents to start a new json file
|
|
json_start =$= $(eval _json_contents := {$$(newline))$(eval _json_indent := $$(4space))
|
|
|
|
# Adds the trailing close brace to _json_contents, and removes any trailing commas if necessary
|
|
json_end =$= $(eval _json_contents := $$(subst $$(comma)$$(newline)__SV_END,$$(newline),$$(_json_contents)__SV_END}$$(newline)))
|
|
|
|
json_contents =$= $(_json_contents)
|