Allow target to specify LOCAL_PREFER_INTEGRITY
The option will: - Produce APK with uncompressed dex - Declare to prefer integrity in manifest Test: unzip -vl, dex compression looks correct with the option provided or not. Test: similarly, aapt dump correct attribute Bug: None Change-Id: I16b9a37255150c2ad84af84087dfabb536a3b07a
This commit is contained in:
@@ -71,6 +71,11 @@ endif
|
||||
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
|
||||
endif
|
||||
|
||||
$(fixed_android_manifest): PRIVATE_MANIFEST_FIXER_FLAGS := $(my_manifest_fixer_flags)
|
||||
# These two libs are added as optional dependencies (<uses-library> with
|
||||
# android:required set to false). This is because they haven't existed in pre-P
|
||||
|
@@ -213,6 +213,7 @@ LOCAL_PREBUILT_MODULE_FILE:=
|
||||
LOCAL_PREBUILT_OBJ_FILES:=
|
||||
LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES:=
|
||||
LOCAL_PREBUILT_STRIP_COMMENTS:=
|
||||
LOCAL_PREFER_INTEGRITY:=
|
||||
LOCAL_PRESUBMIT_DISABLED:=
|
||||
LOCAL_PRIVATE_PLATFORM_APIS:=
|
||||
LOCAL_PRIVILEGED_MODULE:=
|
||||
|
@@ -3,6 +3,12 @@
|
||||
# Output variables: LOCAL_DEX_PREOPT, LOCAL_UNCOMPRESS_DEX, built_odex,
|
||||
# dexpreopt_boot_jar_module
|
||||
|
||||
ifeq (true,$(LOCAL_PREFER_INTEGRITY))
|
||||
LOCAL_UNCOMPRESS_DEX := true
|
||||
else
|
||||
LOCAL_UNCOMPRESS_DEX :=
|
||||
endif
|
||||
|
||||
# We explicitly uncompress APKs of privileged apps, and used by
|
||||
# privileged apps
|
||||
ifneq (true,$(DONT_UNCOMPRESS_PRIV_APPS_DEXS))
|
||||
|
Reference in New Issue
Block a user