summaryrefslogtreecommitdiff
path: root/tools/aapt2/integration-tests
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2017-11-30 15:10:28 -0800
committerAdam Lesinski <adamlesinski@google.com>2017-11-30 16:12:29 -0800
commit2427dce8205607a107880e13b4cdf1caa07cc425 (patch)
tree4af999babef20cea944679544cc00fb25807eb4d /tools/aapt2/integration-tests
parentb4f84afccd933999fc3e507188ce04aecc2a28fe (diff)
AAPT2: Fix issue where exported symbols (@+id/*) were not exported
Test: make AaptTestAppOne Change-Id: If3218c880e83c2cfaf535a099db38504471be676
Diffstat (limited to 'tools/aapt2/integration-tests')
-rw-r--r--tools/aapt2/integration-tests/StaticLibTest/App/AndroidManifest.xml2
-rw-r--r--tools/aapt2/integration-tests/StaticLibTest/App/res/layout/main.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/aapt2/integration-tests/StaticLibTest/App/AndroidManifest.xml b/tools/aapt2/integration-tests/StaticLibTest/App/AndroidManifest.xml
index a5f202dd22fc..c8f4bda9c508 100644
--- a/tools/aapt2/integration-tests/StaticLibTest/App/AndroidManifest.xml
+++ b/tools/aapt2/integration-tests/StaticLibTest/App/AndroidManifest.xml
@@ -21,7 +21,7 @@
<uses-permission-sdk-23 android:name="android.permission.TEST" android:maxSdkVersion="22" />
<application>
- <activity android:name=".MyActivity">
+ <activity android:name=".MyActivity" android:id="@+id/sample_generated_id">
<layout android:defaultHeight="500dp"
android:defaultWidth="600dp" />
</activity>
diff --git a/tools/aapt2/integration-tests/StaticLibTest/App/res/layout/main.xml b/tools/aapt2/integration-tests/StaticLibTest/App/res/layout/main.xml
index aaa884bf7084..5a734296698f 100644
--- a/tools/aapt2/integration-tests/StaticLibTest/App/res/layout/main.xml
+++ b/tools/aapt2/integration-tests/StaticLibTest/App/res/layout/main.xml
@@ -19,7 +19,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
- <fragment class="android.test.sample.App$Inner" />
+ <fragment class="android.test.sample.App$Inner" android:id="@id/sample_generated_id"/>
<variable name="user" type="com.android.User" />