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

Merge "New prebuilt" into nyc-dev am: 93b34141b1

Browse Source 
am: b724b68812

* commit 'b724b68812d5ea90d2d149b2abf7af4f91816bca':
  New prebuilt

Change-Id: I6a2bf01417ada0fee5f6cc4e39bc224bf7731554
This commit is contained in:
Wang Xiaolei
2016-06-03 23:21:50 +00:00
committed by android-build-merger
parent 849473031b b724b68812
commit 24d859ffb9
5 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
packages/CtsShim/CtsShimPriv.apk
View File

Binary file not shown.

3
packages/CtsShim/build/README
View File

@@ -23,7 +23,7 @@ build:
update prebuilts: update prebuilts:
$ cp out/target/product/shamu/system/priv-app/CtsShimPrivUpgrade/CtsShimPrivUpgrade.apk \ $ cp out/target/product/shamu/system/priv-app/CtsShimPrivUpgrade/CtsShimPrivUpgrade.apk \
cts/hostsidetests/appsecurity/test-apps/IntentFilterApp cts/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp
$ cp out/target/product/shamu/system/priv-app/CtsShimPriv/CtsShimPriv.apk \ $ cp out/target/product/shamu/system/priv-app/CtsShimPriv/CtsShimPriv.apk \
frameworks/base/packages/CtsShim frameworks/base/packages/CtsShim
@@ -31,3 +31,4 @@ revert manifest:
$ pushd frameworks/base && git checkout -- packages/CtsShim/build/shim_priv/AndroidManifest.xml && popd $ pushd frameworks/base && git checkout -- packages/CtsShim/build/shim_priv/AndroidManifest.xml && popd
Finally, upload and submit both the cts/ and frameworks/base/ repos. Finally, upload and submit both the cts/ and frameworks/base/ repos.

6
packages/CtsShim/build/shim/AndroidManifest.xml
View File

@@ -17,8 +17,10 @@
<!-- Manifest for the system CTS shim --> <!-- Manifest for the system CTS shim -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="com.android.cts.ctsshim" package="com.android.cts.ctsshim" >
tools:ignore="MissingVersion" >
<uses-sdk android:minSdkVersion="24"
android:targetSdkVersion="24" />
<application <application
android:hasCode="false" android:hasCode="false"

6
packages/CtsShim/build/shim_priv/AndroidManifest.xml
View File

@@ -17,8 +17,10 @@
<!-- Manifest for the privileged CTS shim --> <!-- Manifest for the privileged CTS shim -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="com.android.cts.priv.ctsshim" package="com.android.cts.priv.ctsshim" >
tools:ignore="MissingVersion" >
<uses-sdk android:minSdkVersion="24"
android:targetSdkVersion="24" />
<restrict-upgrade <restrict-upgrade
android:hash="__HASH__" /> android:hash="__HASH__" />

6
packages/CtsShim/build/shim_priv_upgrade/AndroidManifest.xml
View File

@@ -17,8 +17,10 @@
<!-- Manifest for the privileged CTS shim upgrade --> <!-- Manifest for the privileged CTS shim upgrade -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="com.android.cts.priv.ctsshim" package="com.android.cts.priv.ctsshim" >
tools:ignore="MissingVersion" >
<uses-sdk android:minSdkVersion="24"
android:targetSdkVersion="24" />
<application <application
android:hasCode="false" android:hasCode="false"