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

Commit 531b8f4f authored by Xin Li's avatar Xin Li
Browse files

Merge Android 12 

Bug: 202323961
Merged-In: Iba1443da42161f4a41830081f2e1985b30444cc0
Change-Id: I2bebe60bb7114706a3ba6af35522268cdf031f41
parents fa565ffc ee05ff24

.gitignore

+3 −1
Original line number Diff line number Diff line
@@ -3,3 +3,5 @@ 
*.iml

*.sw*

gen/

.vscode/

*.code-workspace

.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: "7396576"

    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: "7396576"

    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: "7396576"

    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: "7396576"

    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 {

  }

}