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

Commit 1606b7d3 authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Xin Li
Browse files

Merge ab/7633965 

Bug: 169893837
Merged-In: I3ef19b77bc33546a3e80bca75532d017b4712054
Change-Id: I595fb801f4519177825f3fdc0021fb874a36aa31
parents 6041a066 ccdb3242

.prebuilt_info/prebuilt_info_packages_CtsShim_apk__arm_CtsShimPriv_apk.asciipb

+3 −1
Original line number Diff line number Diff line 
drops {

  android_build_drop {

    build_id: "7471822"

    build_id: "7552332"

    target: "CtsShim"

    source_file: "aosp_arm64/CtsShimPriv.apk"

  }
@@ -10,4 +10,6 @@ drops { 
  git_project: "platform/frameworks/base"

  git_branch: "sc-dev"

  transform: TRANSFORM_NONE

  transform_options {

  }

}

.prebuilt_info/prebuilt_info_packages_CtsShim_apk__arm_CtsShim_apk.asciipb

+3 −1
Original line number Diff line number Diff line 
drops {

  android_build_drop {

    build_id: "7471822"

    build_id: "7552332"

    target: "CtsShim"

    source_file: "aosp_arm64/CtsShim.apk"

  }
@@ -10,4 +10,6 @@ drops { 
  git_project: "platform/frameworks/base"

  git_branch: "sc-dev"

  transform: TRANSFORM_NONE

  transform_options {

  }

}

.prebuilt_info/prebuilt_info_packages_CtsShim_apk__x86_CtsShimPriv_apk.asciipb

+3 −1
Original line number Diff line number Diff line 
drops {

  android_build_drop {

    build_id: "7471822"

    build_id: "7552332"

    target: "CtsShim"

    source_file: "aosp_x86_64/CtsShimPriv.apk"

  }
@@ -10,4 +10,6 @@ drops { 
  git_project: "platform/frameworks/base"

  git_branch: "sc-dev"

  transform: TRANSFORM_NONE

  transform_options {

  }

}

.prebuilt_info/prebuilt_info_packages_CtsShim_apk__x86_CtsShim_apk.asciipb

+3 −1
Original line number Diff line number Diff line 
drops {

  android_build_drop {

    build_id: "7471822"

    build_id: "7552332"

    target: "CtsShim"

    source_file: "aosp_x86_64/CtsShim.apk"

  }
@@ -10,4 +10,6 @@ drops { 
  git_project: "platform/frameworks/base"

  git_branch: "sc-dev"

  transform: TRANSFORM_NONE

  transform_options {

  }

}

Android.bp

+4 −1
Original line number Diff line number Diff line
@@ -103,8 +103,9 @@ filegroup { 
        ":android.hardware.security.secureclock-V1-java-source",

        ":android.security.apc-java-source",

        ":android.security.authorization-java-source",

        ":android.security.legacykeystore-java-source",

        ":android.security.maintenance-java-source",

        ":android.security.vpnprofilestore-java-source",

        ":android.security.metrics-java-source",

        ":android.system.keystore2-V1-java-source",

        ":credstore_aidl",

        ":dumpstate_aidl",
@@ -295,6 +296,7 @@ java_defaults { 
        ],

        include_dirs: [

            "frameworks/av/aidl",

            "frameworks/native/libs/permission/aidl",

            "packages/modules/Connectivity/framework/aidl-export",

        ],

    },
@@ -536,6 +538,7 @@ stubs_defaults { 
        ],

        include_dirs: [

            "frameworks/av/aidl",

            "frameworks/native/libs/permission/aidl",

            "packages/modules/Connectivity/framework/aidl-export",

        ],

    },