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

Commit c8e3c7c8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "AAPT2: Workaround for feature splits without namespacing"

parents 600c006c 490595a5

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 += --rename-manifest-package com.android.test.split.feature

LOCAL_AAPT_FLAGS += --custom-package com.android.test.split.feature.one



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.one"

    package="com.android.test.split.feature"

    featureSplit="feature1">



    <uses-sdk android:minSdkVersion="21" />



    <application>

        <activity android:name=".One" android:label="Feature One">

        <activity android:name=".one.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>@*com.android.test.split.feature:string/app_title</item>

        <item>@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 += --rename-manifest-package com.android.test.split.feature

LOCAL_AAPT_FLAGS += --custom-package com.android.test.split.feature.two



include $(BUILD_PACKAGE)

tests/FeatureSplit/feature2/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
-->



<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.test.split.feature.two"

    package="com.android.test.split.feature"

    featureSplit="feature2">



    <uses-sdk android:minSdkVersion="21" />