aboutsummaryrefslogtreecommitdiffstats
path: root/testapps/customViewTest
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2012-02-27 11:43:02 -0800
committerXavier Ducrohet <xav@android.com>2012-02-27 11:44:17 -0800
commitda1c452fe47ca12fa89156531e78a3ab218fdbe9 (patch)
tree919fb2e862fd754e12f50f8c2a9ae2332c669ee9 /testapps/customViewTest
parent9109f4c300ac241beaa6adec77844b81e8fc2552 (diff)
downloadsdk-da1c452fe47ca12fa89156531e78a3ab218fdbe9.zip
sdk-da1c452fe47ca12fa89156531e78a3ab218fdbe9.tar.gz
sdk-da1c452fe47ca12fa89156531e78a3ab218fdbe9.tar.bz2
Ensure R/Manifest/BuildConfig classes are not added to the library jar file.
First, their are not needed there, second they can create a dx conflict if the library uses the same package as the app. Change-Id: I67b3f478d5d7ab79d02b6ece8b1eae31b8ed104e
Diffstat (limited to 'testapps/customViewTest')
-rw-r--r--testapps/customViewTest/libWithCustomView/AndroidManifest.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/testapps/customViewTest/libWithCustomView/AndroidManifest.xml b/testapps/customViewTest/libWithCustomView/AndroidManifest.xml
index 7e5c61a..89cff95 100644
--- a/testapps/customViewTest/libWithCustomView/AndroidManifest.xml
+++ b/testapps/customViewTest/libWithCustomView/AndroidManifest.xml
@@ -4,4 +4,15 @@
android:versionCode="1"
android:versionName="1.0" >
+ <permission
+ android:name="com.foo.mypermission"
+ android:description="@string/app_name"
+ android:label="@string/app_name" >
+ </permission>
+ <permission
+ android:name="com.foo.mypermission2"
+ android:description="@string/app_name"
+ android:label="@string/app_name" >
+ </permission>
+
</manifest> \ No newline at end of file