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

Commit 423be675 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Rename preferCodeIntegrity to useEmbeddedDex"

parents 246e7286 06769c7e

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_CODE_INTEGRITY))

    my_manifest_fixer_flags += --prefer-code-integrity

ifeq (true,$(LOCAL_USE_EMBEDDED_DEX))

    my_manifest_fixer_flags += --use-embedded-dex

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
@@ -212,7 +212,7 @@ LOCAL_PREBUILT_MODULE_FILE:= 
LOCAL_PREBUILT_OBJ_FILES:=

LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES:=

LOCAL_PREBUILT_STRIP_COMMENTS:=

LOCAL_PREFER_CODE_INTEGRITY:=

LOCAL_USE_EMBEDDED_DEX:=

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_CODE_INTEGRITY))

ifeq (true,$(LOCAL_USE_EMBEDDED_DEX))

  LOCAL_UNCOMPRESS_DEX := true

else

  LOCAL_UNCOMPRESS_DEX :=
@@ -180,7 +180,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, 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, UncompressedDex,               $(filter true,$(LOCAL_UNCOMPRESS_DEX)))

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