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

Merge "AAPT2: Allow <uses-permission-sdk-23> in manifest" into oc-dev

Browse Source 
am: 0d11c91d9e

Change-Id: I27d82f39f3063a9d03a5e4973c45c39e7f0054f6
This commit is contained in:
Adam Lesinski
2017-05-13 00:04:25 +00:00
committed by android-build-merger
parent d0aef6b78d 0d11c91d9e
commit 25b63c7bb8
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/aapt2/integration-tests/AppOne/AndroidManifest.xml
View File

@@ -17,4 +17,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.aapt.app.one" coreApp="true">
<uses-sdk android:minSdkVersion="21" />
<uses-permission-sdk-23 android:name="android.permission.TEST" android:maxSdkVersion="22" />
</manifest>

1
tools/aapt2/link/ManifestFixer.cpp
View File

@@ -295,6 +295,7 @@ bool ManifestFixer::BuildRules(xml::XmlActionExecutor* executor,
manifest_action["original-package"];
manifest_action["protected-broadcast"];
manifest_action["uses-permission"];
manifest_action["uses-permission-sdk-23"];
manifest_action["permission"];
manifest_action["permission-tree"];
manifest_action["permission-group"];