Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96cc9ae9 authored by Adam Lesinski's avatar Adam Lesinski
Browse files

Update FeatureSplit sample 

This updates the FeatureSplit test sample to reflect the current
way of doing correct feature splits.

This is not final, as aapt2 will be gaining some improvements to
make access of private resources across feature splits valid by default.

Bug: 65096694
Test: manual
Change-Id: I4524dc161d46c5479b5abe340eb93844078ed316
parent 8a0f0ed4

tests/FeatureSplit/base/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -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

tests/FeatureSplit/feature1/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -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)

tests/FeatureSplit/feature1/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -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" />

tests/FeatureSplit/feature1/res/values/values.xml

+1 −1
Original line number Diff line number Diff line
@@ -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>

tests/FeatureSplit/feature2/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -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)