tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge changes I9b67fd2a,I761f2d06

Browse source 
am: bcc94297e0

Change-Id: Ie7c308cd55887db1666a532e42359e14140738fb
This commit is contained in:
Colin Cross 2018-05-25 13:41:07 -07:00 committed by android-build-merger
commit 60c80c4323
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/force_aapt2.mk
View file

@ -17,7 +17,7 @@
# Including this makefile will force AAPT2 on if FORCE_AAPT2==true,
# rewriting some properties to convert standard AAPT usage to AAPT2.
ifeq ($(FORCE_AAPT2),true)
ifneq ($(FORCE_AAPT2),false)
ifeq ($(LOCAL_USE_AAPT2),)
# Force AAPT2 on
LOCAL_USE_AAPT2 := true
@ -47,7 +47,6 @@ ifeq ($(FORCE_AAPT2),true)
ifeq (,$(strip $(LOCAL_MANIFEST_FILE)$(LOCAL_FULL_MANIFEST_FILE)))
ifeq (,$(wildcard $(LOCAL_PATH)/AndroidManifest.xml))
# work around missing manifests by creating a default one
$(call pretty-warning, Missing manifest file)
LOCAL_FULL_MANIFEST_FILE := $(call local-intermediates-dir,COMMON)/DefaultManifest.xml
ifdef LOCAL_MIN_SDK_VERSION
my_manifest_min_sdk_version := $(LOCAL_MIN_SDK_VERSION)

3
core/java.mk
View file

@ -458,6 +458,9 @@ endif
ifeq ($(filter obfuscation,$(LOCAL_PROGUARD_ENABLED)),)
# By default no obfuscation
common_proguard_flags += -dontobfuscate
# Workaround for b/80081393: R8 discards other attributes when
# -keepattributes *Annotations* is used, even when obfuscation is off.
common_proguard_flags += -keepattributes '*'
endif # No obfuscation
ifeq ($(filter optimization,$(LOCAL_PROGUARD_ENABLED)),)
# By default no optimization