Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update FeatureSplit sample"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-10-17 20:48:32 +00:00
committed by Android (Google) Code Review
parent b2a91576ef 96cc9ae90e
commit c593bc086c
7 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/FeatureSplit/base/Android.mk
View File

@@ -17,6 +17,7 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_USE_AAPT2 := true
LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_PACKAGE_NAME := FeatureSplitBase
LOCAL_EXPORT_PACKAGE_RESOURCES := true

2
tests/FeatureSplit/feature1/Android.mk
View File

@@ -26,6 +26,6 @@ LOCAL_APK_LIBRARIES := FeatureSplitBase
LOCAL_RES_LIBRARIES := FeatureSplitBase
LOCAL_AAPT_FLAGS += --package-id 0x80
LOCAL_AAPT_FLAGS += --custom-package com.android.test.split.feature.one
LOCAL_AAPT_FLAGS += --rename-manifest-package com.android.test.split.feature
include $(BUILD_PACKAGE)

4
tests/FeatureSplit/feature1/AndroidManifest.xml
View File

@@ -15,13 +15,13 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.test.split.feature"
package="com.android.test.split.feature.one"
featureSplit="feature1">
<uses-sdk android:minSdkVersion="21" />
<application>
<activity android:name=".one.One" android:label="Feature One">
<activity android:name=".One" android:label="Feature One">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />

2
tests/FeatureSplit/feature1/res/values/values.xml
View File

@@ -20,7 +20,7 @@
<integer name="test_integer2">200</integer>
<color name="test_color2">#00ff00</color>
<string-array name="string_array2">
<item>@*string/app_title</item>
<item>@*com.android.test.split.feature:string/app_title</item>
</string-array>
</resources>

2
tests/FeatureSplit/feature2/Android.mk
View File

@@ -26,6 +26,6 @@ LOCAL_APK_LIBRARIES := FeatureSplitBase
LOCAL_RES_LIBRARIES := FeatureSplitBase
LOCAL_AAPT_FLAGS += --package-id 0x81
LOCAL_AAPT_FLAGS += --custom-package com.android.test.split.feature.two
LOCAL_AAPT_FLAGS += --rename-manifest-package com.android.test.split.feature
include $(BUILD_PACKAGE)

2
tests/FeatureSplit/feature2/AndroidManifest.xml
View File

@@ -15,7 +15,7 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.test.split.feature"
package="com.android.test.split.feature.two"
featureSplit="feature2">
<uses-sdk android:minSdkVersion="21" />

2
tests/FeatureSplit/feature2/res/values/values.xml
View File

@@ -18,7 +18,7 @@
<integer name="test_integer3">300</integer>
<color name="test_color3">#0000ff</color>
<string-array name="string_array3">
<item>@string/app_title</item>
<item>@*com.android.test.split.feature:string/app_title</item>
</string-array>
</resources>