PeterCxy/SetupWizardLibrary
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Don't use $(call my-dir) in common.mk

Browse source 
$(call my-dir) changes the LOCAL_MODULE_MAKEFILE variable, and setup
wizard lib should not be using it. Replaced them with
$(dir $(lastword $(MAKEFILE_LIST))).

Test: `m` shows the error messages attributed to the correct makefile
Bug: 35479731
Change-Id: Ie4577d840848b5b141a574c3a859b5ee9767704c
This commit is contained in:
Maurice Lam 2017-02-17 16:07:58 -08:00
parent 0093ffd929
commit 8dc50c2ee9
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
library/common-gingerbread.mk
View file

@ -12,6 +12,9 @@
# include frameworks/opt/setupwizard/library/common-gingerbread.mk
#
# Path to directory of setup wizard lib (e.g. frameworks/opt/setupwizard/library)
suwlib_dir := $(dir $(lastword $(MAKEFILE_LIST)))
ifneq ($(LOCAL_USE_AAPT2),true)
# Check that LOCAL_RESOURCE_DIR is defined
@ -27,9 +30,9 @@ endif
# Include setup wizard library, if not already included
ifeq (,$(findstring setup-wizard-lib-gingerbread-compat,$(LOCAL_STATIC_JAVA_LIBRARIES)))
LOCAL_RESOURCE_DIR += \
$(call my-dir)/main/res \
$(call my-dir)/eclair-mr1/res \
$(call my-dir)/full-support/res
$(suwlib_dir)/main/res \
$(suwlib_dir)/eclair-mr1/res \
$(suwlib_dir)/full-support/res
LOCAL_AAPT_FLAGS += --extra-packages com.android.setupwizardlib
LOCAL_STATIC_JAVA_LIBRARIES += setup-wizard-lib-gingerbread-compat
endif
@ -65,4 +68,3 @@ ifeq (,$(findstring android-support-v7-recyclerview,$(LOCAL_STATIC_ANDROID_LIBRA
endif
endif # LOCAL_USE_AAPT2

7
library/common.mk
View file

@ -12,10 +12,13 @@
# include frameworks/opt/setupwizard/library/common.mk
#
# Path to directory of setup wizard lib (e.g. frameworks/opt/setupwizard/library)
suwlib_path := $(dir $(lastword $(MAKEFILE_LIST)))
ifneq ($(LOCAL_USE_AAPT2),true)
LOCAL_RESOURCE_DIR += \
$(call my-dir)/main/res \
$(call my-dir)/platform/res
$(suwlib_path)/main/res \
$(suwlib_path)/platform/res
LOCAL_AAPT_FLAGS += --auto-add-overlay --extra-packages com.android.setupwizardlib
LOCAL_STATIC_JAVA_LIBRARIES += setup-wizard-lib
else # LOCAL_USE_AAPT2 := true