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

Commit 943cab06 authored by John Wu's avatar John Wu Committed by Android Build Coastguard Worker
Browse files

Revert "Update CtsShim to use sharedUserId" 

This reverts commit 4123ccf1.

Reason for revert: b/295549202

Bug: 295549202
Flag: EXEMPT bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:65ec0244672780c509bb849b9b4471941eefd4ee)
Merged-In: I958805108bd8e2a90e79ae8f2add6616bc82ad84
Change-Id: I958805108bd8e2a90e79ae8f2add6616bc82ad84
parent 5b10581d

packages/CtsShim/build/Android.bp

+8 −36
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ genrule { 
  name: "generate_priv_manifest",

  srcs: [

    "shim_priv/AndroidManifest.xml",

        ":CtsShimPrivUpgrade",

    ":CtsShimPrivUpgrade"

  ],

  out: ["AndroidManifest.xml"],

  cmd: "sed -e s/__HASH__/`sha512sum -b $(location :CtsShimPrivUpgrade) | cut -d' ' -f1`/ $(location shim_priv/AndroidManifest.xml) > $(out)",
@@ -152,34 +152,6 @@ android_app { 
    ],

}



//##########################################################

// Variant: System app upgrade



android_app {

    name: "CtsShimUpgrade",



    sdk_version: "current",

    optimize: {

        enabled: false,

    },

    dex_preopt: {

        enabled: false,

    },



    manifest: "shim/AndroidManifestUpgrade.xml",

    min_sdk_version: "24",

}



genrule {

    name: "generate_shim_manifest",

    srcs: [

        "shim/AndroidManifest.xml",

        ":CtsShimUpgrade",

    ],

    out: ["AndroidManifest.xml"],

    cmd: "sed -e s/__HASH__/`sha512sum -b $(location :CtsShimUpgrade) | cut -d' ' -f1`/ $(location shim/AndroidManifest.xml) > $(out)",

}



//##########################################################

// Variant: System app
@@ -194,7 +166,7 @@ android_app { 
        enabled: false,

    },



    manifest: ":generate_shim_manifest",

    manifest: "shim/AndroidManifest.xml",

    apex_available: [

        "//apex_available:platform",

        "com.android.apex.cts.shim.v1",

packages/CtsShim/build/shim/AndroidManifest.xml

+3 −5
Original line number Diff line number Diff line
@@ -17,15 +17,13 @@ 
<!-- 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"

    android:sharedUserId="com.android.cts.ctsshim" >

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



    <uses-sdk

        android:minSdkVersion="24"

    <uses-sdk android:minSdkVersion="24"

        android:targetSdkVersion="28" />



    <restrict-update

        android:hash="__HASH__" />

        android:hash="__CAN_NOT_BE_UPDATED__" />



    <application

        android:hasCode="false"

packages/CtsShim/build/shim/AndroidManifestUpgrade.xml

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2016 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<!-- 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" >



    <uses-sdk

        android:minSdkVersion="24"

        android:targetSdkVersion="28" />



    <application

        android:hasCode="false"

        tools:ignore="AllowBackup,MissingApplicationIcon" />

</manifest>