Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7973d91a authored by Victor Hsieh's avatar Victor Hsieh Committed by android-build-merger
Browse files

Merge "Rename to LOCAL_PREFER_CODE_INTEGRITY" am: 6fee1039 

am: d5605989

Change-Id: I7029ebb1bad260a4a3914b1c577231e3f23f1009
parents 5420770b d5605989

core/android_manifest.mk

+2 −2
Original line number Diff line number Diff line
@@ -72,8 +72,8 @@ ifeq ($(LOCAL_PRIVATE_PLATFORM_APIS),true) 
    my_manifest_fixer_flags += --uses-non-sdk-api

endif



ifeq (true,$(LOCAL_PREFER_INTEGRITY))

    my_manifest_fixer_flags += --prefer-integrity

ifeq (true,$(LOCAL_PREFER_CODE_INTEGRITY))

    my_manifest_fixer_flags += --prefer-code-integrity

endif



$(fixed_android_manifest): PRIVATE_MANIFEST_FIXER_FLAGS := $(my_manifest_fixer_flags)

core/clear_vars.mk

+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ LOCAL_PREBUILT_MODULE_FILE:= 
LOCAL_PREBUILT_OBJ_FILES:=

LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES:=

LOCAL_PREBUILT_STRIP_COMMENTS:=

LOCAL_PREFER_INTEGRITY:=

LOCAL_PREFER_CODE_INTEGRITY:=

LOCAL_PRESUBMIT_DISABLED:=

LOCAL_PRIVATE_PLATFORM_APIS:=

LOCAL_PRIVILEGED_MODULE:=

core/dex_preopt_odex_install.mk

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
# Output variables: LOCAL_DEX_PREOPT, LOCAL_UNCOMPRESS_DEX, built_odex,

#                   dexpreopt_boot_jar_module



ifeq (true,$(LOCAL_PREFER_INTEGRITY))

ifeq (true,$(LOCAL_PREFER_CODE_INTEGRITY))

  LOCAL_UNCOMPRESS_DEX := true

else

  LOCAL_UNCOMPRESS_DEX :=
@@ -181,7 +181,7 @@ ifdef LOCAL_DEX_PREOPT 
  $(call add_json_str,  BuildPath,                     $(LOCAL_BUILT_MODULE))

  $(call add_json_str,  DexPath,                       $$1)

  $(call add_json_str,  ExtrasOutputPath,              $$2)

  $(call add_json_bool, PreferIntegrity,               $(filter true,$(LOCAL_PREFER_INTEGRITY)))

  $(call add_json_bool, PreferCodeIntegrity,           $(filter true,$(LOCAL_PREFER_CODE_INTEGRITY)))

  $(call add_json_bool, Privileged,                    $(filter true,$(LOCAL_PRIVILEGED_MODULE)))

  $(call add_json_bool, UncompressedDex,               $(filter true,$(LOCAL_UNCOMPRESS_DEX)))

  $(call add_json_bool, HasApkLibraries,               $(LOCAL_APK_LIBRARIES))