diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2017-03-03 16:33:26 -0800 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2017-03-07 11:06:16 -0800 |
| commit | f34b6f4f2b969b47a3f371eb9549e92ef1680d91 (patch) | |
| tree | ba2db0d2374464655c54dd7a3c24a65207e415a3 /tests/FeatureSplit | |
| parent | df2870df9ae6e5dbb7acfe3d5fd840a3317b0e66 (diff) | |
AAPT2: Add --package-id flag for feature-split suppport
Bug: 35928935
Change-Id: Ia8496505e61cfcfdb8f9f62366d2f36e453db111
Test: make aapt2_tests
Diffstat (limited to 'tests/FeatureSplit')
| -rw-r--r-- | tests/FeatureSplit/base/Android.mk | 1 | ||||
| -rw-r--r-- | tests/FeatureSplit/feature1/Android.mk | 12 | ||||
| -rw-r--r-- | tests/FeatureSplit/feature2/Android.mk | 15 |
3 files changed, 10 insertions, 18 deletions
diff --git a/tests/FeatureSplit/base/Android.mk b/tests/FeatureSplit/base/Android.mk index 7c0fc04a445a..93f6d7a5f52b 100644 --- a/tests/FeatureSplit/base/Android.mk +++ b/tests/FeatureSplit/base/Android.mk @@ -19,6 +19,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := FeatureSplitBase +LOCAL_EXPORT_PACKAGE_RESOURCES := true LOCAL_MODULE_TAGS := tests diff --git a/tests/FeatureSplit/feature1/Android.mk b/tests/FeatureSplit/feature1/Android.mk index aa222dd6aa66..e6ba5c2d04c9 100644 --- a/tests/FeatureSplit/feature1/Android.mk +++ b/tests/FeatureSplit/feature1/Android.mk @@ -17,17 +17,15 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) +LOCAL_USE_AAPT2 := true LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := FeatureSplit1 LOCAL_MODULE_TAGS := tests -featureOf := FeatureSplitBase +LOCAL_APK_LIBRARIES := FeatureSplitBase +LOCAL_RES_LIBRARIES := FeatureSplitBase -LOCAL_APK_LIBRARIES := $(featureOf) -featureOfApk := $(call intermediates-dir-for,APPS,$(featureOf))/package.apk -localRStamp := $(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),,COMMON)/src/R.stamp -$(localRStamp): $(featureOfApk) - -LOCAL_AAPT_FLAGS := --feature-of $(featureOfApk) --custom-package com.android.test.split.feature.one +LOCAL_AAPT_FLAGS += --package-id 0x80 +LOCAL_AAPT_FLAGS += --custom-package com.android.test.split.feature.one include $(BUILD_PACKAGE) diff --git a/tests/FeatureSplit/feature2/Android.mk b/tests/FeatureSplit/feature2/Android.mk index 1a0322bf686e..c8e860942fa3 100644 --- a/tests/FeatureSplit/feature2/Android.mk +++ b/tests/FeatureSplit/feature2/Android.mk @@ -17,22 +17,15 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) +LOCAL_USE_AAPT2 := true LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := FeatureSplit2 LOCAL_MODULE_TAGS := tests -featureOf := FeatureSplitBase -featureAfter := FeatureSplit1 +LOCAL_APK_LIBRARIES := FeatureSplitBase +LOCAL_RES_LIBRARIES := FeatureSplitBase -LOCAL_APK_LIBRARIES := $(featureOf) - -featureOfApk := $(call intermediates-dir-for,APPS,$(featureOf))/package.apk -featureAfterApk := $(call intermediates-dir-for,APPS,$(featureAfter))/package.apk -localRStamp := $(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),,COMMON)/src/R.stamp -$(localRStamp): $(featureOfApk) $(featureAfterApk) - -LOCAL_AAPT_FLAGS := --feature-of $(featureOfApk) -LOCAL_AAPT_FLAGS += --feature-after $(featureAfterApk) +LOCAL_AAPT_FLAGS += --package-id 0x81 LOCAL_AAPT_FLAGS += --custom-package com.android.test.split.feature.two include $(BUILD_PACKAGE) |