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

Commit 93b34141 authored by Wang Xiaolei's avatar Wang Xiaolei Committed by Android (Google) Code Review
Browse files

Merge "New prebuilt" into nyc-dev

parents 44b24c9b 51e458eb

packages/CtsShim/CtsShimPriv.apk

−2 B (5.88 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

packages/CtsShim/build/README

+3 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ build: 


update prebuilts:

    $ 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 \

        frameworks/base/packages/CtsShim
@@ -31,3 +31,4 @@ revert manifest: 
    $ pushd frameworks/base && git checkout -- packages/CtsShim/build/shim_priv/AndroidManifest.xml && popd



Finally, upload and submit both the cts/ and frameworks/base/ repos.

packages/CtsShim/build/shim/AndroidManifest.xml

+4 −2
Original line number Diff line number Diff line
@@ -17,8 +17,10 @@ 
<!-- Manifest for the system CTS shim -->

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

    xmlns:tools="http://schemas.android.com/tools"

    package="com.android.cts.ctsshim"

    tools:ignore="MissingVersion" >

    package="com.android.cts.ctsshim" >



    <uses-sdk android:minSdkVersion="24"

        android:targetSdkVersion="24" />



    <application

        android:hasCode="false"

packages/CtsShim/build/shim_priv/AndroidManifest.xml

+4 −2
Original line number Diff line number Diff line
@@ -17,8 +17,10 @@ 
<!-- Manifest for the privileged CTS shim -->

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

    xmlns:tools="http://schemas.android.com/tools"

    package="com.android.cts.priv.ctsshim"

    tools:ignore="MissingVersion" >

    package="com.android.cts.priv.ctsshim" >



    <uses-sdk android:minSdkVersion="24"

        android:targetSdkVersion="24" />



    <restrict-upgrade

        android:hash="__HASH__" />

packages/CtsShim/build/shim_priv_upgrade/AndroidManifest.xml

+4 −2
Original line number Diff line number Diff line
@@ -17,8 +17,10 @@ 
<!-- Manifest for the privileged CTS shim upgrade -->

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

    xmlns:tools="http://schemas.android.com/tools"

    package="com.android.cts.priv.ctsshim"

    tools:ignore="MissingVersion" >

    package="com.android.cts.priv.ctsshim" >



    <uses-sdk android:minSdkVersion="24"

        android:targetSdkVersion="24" />



    <application

        android:hasCode="false"