openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Rename preferCodeIntegrity to useEmbeddedDex" 

am: 423be675eb

Change-Id: Ibb7bde4e6e3e85d4c82378f921d93419e1ccce1c
This commit is contained in:
Victor Hsieh 2019-01-29 21:25:14 -08:00 committed by android-build-merger
parent 4f819cda1b 423be675eb
commit a042ad0670
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/android_manifest.mk
View File

@ -72,8 +72,8 @@ ifeq ($(LOCAL_PRIVATE_PLATFORM_APIS),true)
my_manifest_fixer_flags += --uses-non-sdk-api my_manifest_fixer_flags += --uses-non-sdk-api
endif endif
ifeq (true,$(LOCAL_PREFER_CODE_INTEGRITY)) ifeq (true,$(LOCAL_USE_EMBEDDED_DEX))
my_manifest_fixer_flags += --prefer-code-integrity my_manifest_fixer_flags += --use-embedded-dex
endif endif
$(fixed_android_manifest): PRIVATE_MANIFEST_FIXER_FLAGS := $(my_manifest_fixer_flags) $(fixed_android_manifest): PRIVATE_MANIFEST_FIXER_FLAGS := $(my_manifest_fixer_flags)

2
core/clear_vars.mk
View File

@ -212,7 +212,7 @@ LOCAL_PREBUILT_MODULE_FILE:=
LOCAL_PREBUILT_OBJ_FILES:= LOCAL_PREBUILT_OBJ_FILES:=
LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES:= LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES:=
LOCAL_PREBUILT_STRIP_COMMENTS:= LOCAL_PREBUILT_STRIP_COMMENTS:=
LOCAL_PREFER_CODE_INTEGRITY:= LOCAL_USE_EMBEDDED_DEX:=
LOCAL_PRESUBMIT_DISABLED:= LOCAL_PRESUBMIT_DISABLED:=
LOCAL_PRIVATE_PLATFORM_APIS:= LOCAL_PRIVATE_PLATFORM_APIS:=
LOCAL_PRIVILEGED_MODULE:= LOCAL_PRIVILEGED_MODULE:=

4
core/dex_preopt_odex_install.mk
View File

@ -3,7 +3,7 @@
# Output variables: LOCAL_DEX_PREOPT, LOCAL_UNCOMPRESS_DEX, built_odex, # Output variables: LOCAL_DEX_PREOPT, LOCAL_UNCOMPRESS_DEX, built_odex,
# dexpreopt_boot_jar_module # dexpreopt_boot_jar_module
ifeq (true,$(LOCAL_PREFER_CODE_INTEGRITY)) ifeq (true,$(LOCAL_USE_EMBEDDED_DEX))
LOCAL_UNCOMPRESS_DEX := true LOCAL_UNCOMPRESS_DEX := true
else else
LOCAL_UNCOMPRESS_DEX := LOCAL_UNCOMPRESS_DEX :=
@ -180,7 +180,7 @@ ifdef LOCAL_DEX_PREOPT
$(call add_json_str, BuildPath, $(LOCAL_BUILT_MODULE)) $(call add_json_str, BuildPath, $(LOCAL_BUILT_MODULE))
$(call add_json_str, DexPath, $$1) $(call add_json_str, DexPath, $$1)
$(call add_json_str, ExtrasOutputPath, $$2) $(call add_json_str, ExtrasOutputPath, $$2)
$(call add_json_bool, PreferCodeIntegrity, $(filter true,$(LOCAL_PREFER_CODE_INTEGRITY))) $(call add_json_bool, UseEmbeddedDex, $(filter true,$(LOCAL_USE_EMBEDDED_DEX)))
$(call add_json_bool, Privileged, $(filter true,$(LOCAL_PRIVILEGED_MODULE))) $(call add_json_bool, Privileged, $(filter true,$(LOCAL_PRIVILEGED_MODULE)))
$(call add_json_bool, UncompressedDex, $(filter true,$(LOCAL_UNCOMPRESS_DEX))) $(call add_json_bool, UncompressedDex, $(filter true,$(LOCAL_UNCOMPRESS_DEX)))
$(call add_json_bool, HasApkLibraries, $(LOCAL_APK_LIBRARIES)) $(call add_json_bool, HasApkLibraries, $(LOCAL_APK_LIBRARIES))