drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
588,450 Commits 1 Branch 0 Tags
c76708bc68
Commit Graph

66 Commits

Author SHA1 Message Date
Jooyung Han
ab9f225662 make CtsShim*Prebuilt available to platform 
CtsShim*Prebuilt are listed in PRODUCT_PACKAGES.
They should be available to "//apex_available:platform".

Bug: 158169437
Bug: 159392784
Test: presubmit
Change-Id: I5eec7a62e07f9d5138f7fd71268d5dd2ca2e77d4
 2020-06-22 08:32:34 +00:00
Jooyung Han
d1e2821aa7 Revert "Revert "Make CtsShim*Prebuilt be available to the test APEXes"" 
This reverts commit 77cd43a7211ea1a9fbfa90f74976fe9f9ef0631e.

We need a cts shim apex target with prebuilts so that GSI can install
cts shim apks as a part of flattened cts shim apex.

Bug: 159392784
Test: lunch aosp_arm64-userdebug
      m droid => should have cts shim in /system/system_ext/apex/
Change-Id: Ib18dd105d7b959774654182783b973b732127986
 2020-06-20 01:59:26 +00:00
TreeHugger Robot
7d590597d8 Merge "Drop prebuilt files to android source tree." into rvc-dev am: a04008425f am: 3233e504f3 am: aa9aa06262 am: 4c695dbf7e 
Change-Id: I4e1d85de61d0453fe9d1a00721ef07ca88a387e0
 2020-05-21 13:50:27 +00:00
TreeHugger Robot
aa9aa06262 Merge "Drop prebuilt files to android source tree." into rvc-dev am: a04008425f am: 3233e504f3 
Change-Id: I97ce519d5b733bc9111d4164a5c58ba4fca5c203
 2020-05-21 13:25:17 +00:00
Dario Freni
44d30e1d9f Drop prebuilt files to android source tree. 
CtsShim.apk
package: name=com.android.cts.ctsshim
versionCode=30
versionName=11-6508977
platformBuildVersionName=R
compileSdkVersion=29
compileSdkVersionCodename=R
sdkVersion:24
targetSdkVersion:28

CtsShimPriv.apk
package: name=com.android.cts.priv.ctsshim
versionCode=30
versionName=11-6508977
platformBuildVersionName=R
compileSdkVersion=29
compileSdkVersionCodename=R
sdkVersion:24
targetSdkVersion:28

CtsShim.apk
package: name=com.android.cts.ctsshim
versionCode=30
versionName=11-6508977
platformBuildVersionName=R
compileSdkVersion=29
compileSdkVersionCodename=R
sdkVersion:24
targetSdkVersion:28

CtsShimPriv.apk
package: name=com.android.cts.priv.ctsshim
versionCode=30
versionName=11-6508977
platformBuildVersionName=R
compileSdkVersion=29
compileSdkVersionCodename=R
sdkVersion:24
targetSdkVersion:28

Built here: ab/6508977

This build IS suitable for public release.

The change is generated with prebuilt drop tool.

Test: presubmit
Bug: 155355480
Change-Id: I9b22b8f2a6678d87e25819fad8d848ac5af288cc
 2020-05-19 11:19:13 +00:00
Ivan Chiang
3a2a2bfbb1 Merge "Update prebuilt CTS shim pkgs with the ones built on server" into rvc-dev am: 466b52e296 am: c88d953406 am: 751c24822b am: 9f7e905164 
Change-Id: I5081081ce7863ce892a2c0bf9b74d4b1ea1a1cf8
 2020-05-04 16:33:41 +00:00
Ivan Chiang
751c24822b Merge "Update prebuilt CTS shim pkgs with the ones built on server" into rvc-dev am: 466b52e296 am: c88d953406 
Change-Id: Ia9bccc274b0ed9c8a297a2232836802ab918af24
 2020-05-04 16:18:13 +00:00
Ivan Chiang
a2868de487 Update prebuilt CTS shim pkgs with the ones built on server 
frameworks/base/packages/CtsShim/apk/CtsShim.apk
package: name='com.android.cts.ctsshim'
versionCode='30'
versionName='11-6458352'
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'24'
targetSdkVersion:'28'

frameworks/base/packages/CtsShim/apk/CtsShim.apk
package: name='com.android.cts.ctsshim'
versionCode='30'
versionName='11-6458352'
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'24'
targetSdkVersion:'28'

frameworks/base/packages/CtsShim/apk/CtsShimPriv.apk
package: name='com.android.cts.priv.ctsshim'
versionCode='30'
versionName='11-6458352'
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'24'
targetSdkVersion:'28'

frameworks/base/packages/CtsShim/apk/CtsShimPriv.apk
package: name='com.android.cts.priv.ctsshim'
versionCode='30'
versionName='11-6458352'
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'24'
targetSdkVersion:'28'

Built here:
https://android-build.googleplex.com/builds/submitted/6458352/CtsShim/latest

This build is suitable for public release.

Bug: 154927160
Test: presubmit
Change-Id: I9c416fb1382deaac392c094463abaf0a1e65c3ea
 2020-05-04 20:28:25 +08:00
TreeHugger Robot
be2037d573 Merge changes I82cecd20,I2b4e41a4 into rvc-dev am: cbbc9c5c21 am: 0b80c491ae am: b057c6ec81 am: 9c165d3270 
Change-Id: I6e03a644faa48ffcd53b3ba21aa90fa68fbb9e2b
 2020-05-02 16:46:35 +00:00
TreeHugger Robot
b057c6ec81 Merge changes I82cecd20,I2b4e41a4 into rvc-dev am: cbbc9c5c21 am: 0b80c491ae 
Change-Id: I6081e2df60ac9e3f5ecee08a22a91b49c24e0a0f
 2020-05-02 16:15:39 +00:00
Jooyung Han
a5ae10228e Set min_sdk_version to be part of mainline modules 
Modules contributing mainline modules (APK/APEX) should set
min_sdk_version as well as apex_available.

For now setting min_sdk_version doesn't change build outputs.
But build-time checks will be added soon.

Bug: 152655956
Test: m
Change-Id: I2b4e41a40f4bc938cccacc116ad3779b6ff31eab
 2020-05-02 00:58:18 +09:00
Dario Freni
77cd43a721 Revert "Make CtsShim*Prebuilt be available to the test APEXes" 
This reverts commit b50e662b3e55014c73a9eccdc5bbbc22311cce1a, change id
I9cf2e30bb38abbb33bf76a0eab0dc2a10a5647c9

This tree doesn't need this as of change
I8179ddb7591aeca41fb84f6726af381d8e7c2e5e

Test: presubmit
Change-Id: I2cc6fba08b00be6bb8c0cb148ac1aafc40d57aab
 2020-04-30 15:30:16 +01:00
Automerger Merge Worker
7a30e0949f Merge "Merge "Update prebuilt CTS shim pkgs with the ones built on server" into rvc-dev am: 1fb1d686bc am: 976b81fc7d am: a26323ffea" into rvc-qpr-dev-plus-aosp am: f340eae81e 
Change-Id: I6c8845281f4f631cb0f40159df52260dfddfa715
 2020-04-28 17:44:24 +00:00
TreeHugger Robot
a26323ffea Merge "Update prebuilt CTS shim pkgs with the ones built on server" into rvc-dev am: 1fb1d686bc am: 976b81fc7d 
Change-Id: Ic2ceeda026c49312e1f984ee99d627babde46c44
 2020-04-28 17:23:11 +00:00
Dario Freni
9a86703856 Update prebuilt CTS shim pkgs with the ones built on server 
frameworks/base/packages/CtsShim/apk/CtsShim.apk
package: name='com.android.cts.ctsshim'
versionCode='29'
versionName='R-6438414'
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'R'
targetSdkVersion:'28'

frameworks/base/packages/CtsShim/apk/CtsShim.apk
package: name='com.android.cts.ctsshim'
versionCode='29'
versionName='R-6438414'
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'R'
targetSdkVersion:'28'

frameworks/base/packages/CtsShim/apk/CtsShimPriv.apk
package: name='com.android.cts.priv.ctsshim'
versionCode='29'
versionName='R-6438414'
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'R'
targetSdkVersion:'28'

frameworks/base/packages/CtsShim/apk/CtsShimPriv.apk
package: name='com.android.cts.priv.ctsshim'
versionCode='29'
versionName='R-6438414'
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'R'
targetSdkVersion:'28'

Built here:
https://android-build.googleplex.com/builds/submitted/6438414/CtsShim/latest

This build is suitable for public release.

Bug: 148447155
Test: presubmit
Change-Id: Ief3acb99ae5c808e990f2b5f2f71695c3f8c9e34
 2020-04-28 14:36:48 +01:00
TreeHugger Robot
744e0b93c5 Merge "Make the APKs visible to another test apex." into rvc-dev am: 9fec6af883 am: 97cc65a9d3 am: d014565314 am: 0ecadb638d 
Change-Id: I8d15f3938751c6a21ad42ec7eb32ddf8a116f515
 2020-04-28 13:20:41 +00:00
TreeHugger Robot
d014565314 Merge "Make the APKs visible to another test apex." into rvc-dev am: 9fec6af883 am: 97cc65a9d3 
Change-Id: Ie8b23683ce85f4356e6b096638c27fa6f1cc77b4
 2020-04-28 12:39:39 +00:00
TreeHugger Robot
cf373eae3b Merge "Update prebuilt CTS shim pkgs with the ones built on server" into rvc-dev am: 6b25213d68 am: 5007cd55a6 am: 393e2b2dce am: e987e13651 
Change-Id: I8248dd831f2edffc1be4c338c914986b47712e5d
 2020-04-28 12:13:51 +00:00
TreeHugger Robot
9fec6af883 Merge "Make the APKs visible to another test apex." into rvc-dev 2020-04-28 12:03:48 +00:00
TreeHugger Robot
393e2b2dce Merge "Update prebuilt CTS shim pkgs with the ones built on server" into rvc-dev am: 6b25213d68 am: 5007cd55a6 
Change-Id: I8b30f0fc3840cb7a8fd8b757ab84af673306ddc2
 2020-04-28 11:31:55 +00:00
Dario Freni
7109f5eec1 Make the APKs visible to another test apex. 
Bug: 148447155
Test: m
Change-Id: Ia690096a1cd7002759fea919b939cf33a70b9894
 2020-04-27 18:38:07 +01:00
Mohammad Samiul Islam
75225ed10d Update prebuilt CTS shim pkgs with the ones built on server 
frameworks/base/packages/CtsShim/apk/arm/CtsShim.apk
package: name='com.android.cts.ctsshim'
versionCode='29'
versionName='R-6434058'
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'R'
targetSdkVersion:'28'

frameworks/base/packages/CtsShim/apk/arm/CtsShimPriv.apk
package: name='com.android.cts.priv.ctsshim'
versionCode='29'
versionName='R-6434058'
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'R'
targetSdkVersion:'28'

frameworks/base/packages/CtsShim/apk/x86/CtsShim.apk
package: name='com.android.cts.ctsshim'
versionCode='29'
versionName='R-6434058'
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'R'
targetSdkVersion:'28'

frameworks/base/packages/CtsShim/apk/x86/CtsShimPriv.apk
package: name='com.android.cts.priv.ctsshim'
versionCode='29'
versionName='R-6434058'
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'R'
targetSdkVersion:'28'

Built here:
https://android-build.googleplex.com/builds/submitted/6434058/CtsShim_arm64/latest
https://android-build.googleplex.com/builds/submitted/6434058/CtsShim_x86_64/latest

This build is suitable for public release.

Bug: 152021141
Test: presubmit
Change-Id: Iad9db9a9e72a8f965ca3d2cafaec49c8a35aea24
 2020-04-27 16:30:37 +01:00
TreeHugger Robot
83bc20c1e6 Merge "Update prebuilt CTS shim pkgs with the ones built on server" into rvc-dev am: 304562d30b am: 216933f1b6 am: 023a10b424 am: b30b974546 
Change-Id: I174d1e0337e2cbc35e35e50fb989fbde08cdeb1f
 2020-04-25 01:52:10 +00:00
TreeHugger Robot
216933f1b6 Merge "Update prebuilt CTS shim pkgs with the ones built on server" into rvc-dev am: 304562d30b 
Change-Id: I6aecd6170d5134b0dafc69ed7279acd13695839b
 2020-04-25 01:19:53 +00:00
TreeHugger Robot
3a7ac8219c Merge changes Ibbbedfd1,Ie8d55627,I67b8d3a0,Ie6815286,I71a51ade 
* changes:
  Add jni_headers dependency to libsmartcamera_jni
  Add jni_headers dependency to libshim_jni
  Add jni_headers dependencies to hosttests
  Add jni_headers to libframeworks_coretests_jni
  Add jni_headers dependency to libperftestscore_jni
 2020-04-24 15:04:50 +00:00
Automerger Merge Worker
0a74cc337a Merge "Merge "Make CtsShim*Prebuilt be available to the test APEXes" am: 25a3473c28 am: 17c45c2c7d am: 5b485b6ab6 am: 22f26859d8" into rvc-qpr-dev-plus-aosp am: 229e5b2d87 
Change-Id: I0747dae8d631c414647b80dd8f86830b48e0ea9c
 2020-04-24 13:17:37 +00:00
Orion Hodson
cef4f8442c Add jni_headers dependency to libshim_jni 
Preparation for removing implicit include paths for jni.h from soong.

Bug: 152482542
Test: m checkbuild
Change-Id: Ie8d55627d835d811ac601fb1e38952e9c1d0903f
 2020-04-24 14:07:27 +01:00
Treehugger Robot
5b485b6ab6 Merge "Make CtsShim*Prebuilt be available to the test APEXes" am: 25a3473c28 am: 17c45c2c7d 
Change-Id: I73a7b6bc5f26715c9bc038ec1c3cdbbeaa13e9c0
 2020-04-24 12:41:32 +00:00
Ivan Chiang
602464869f Update prebuilt CTS shim pkgs with the ones built on server 
frameworks/base/packages/CtsShim/apk/arm/CtsShim.apk
package: name='com.android.cts.ctsshim'
versionCode='29'
versionName='R-6425162'
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'R'
targetSdkVersion:'28'

frameworks/base/packages/CtsShim/apk/arm/CtsShimPriv.apk
package: name='com.android.cts.priv.ctsshim'
versionCode='29'
versionName='R-6425162'
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'R'
targetSdkVersion:'28'

frameworks/base/packages/CtsShim/apk/x86/CtsShim.apk
package: name='com.android.cts.ctsshim'
versionCode='29'
versionName='R-6425162'
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'R'
targetSdkVersion:'28'

frameworks/base/packages/CtsShim/apk/x86/CtsShimPriv.apk
package: name='com.android.cts.priv.ctsshim'
versionCode='29'
versionName='R-6425162'
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'R'
targetSdkVersion:'28'

Built here:
https://android-build.googleplex.com/builds/submitted/6425162/CtsShim_arm64/latest
https://android-build.googleplex.com/builds/submitted/6425162/CtsShim_x86_64/latest

This build is suitable for public release.

Bug: 154025817
Test: presubmit
Change-Id: Ica5c00d37a22c884bcfad6d74358b1379ba08385
 2020-04-24 10:19:23 +00:00
TreeHugger Robot
dadc2b4ff3 Merge "Update prebuilt CTS shim pkgs with the ones built on server" into rvc-dev am: ee6c47cff8 am: 0e39f5f0f1 am: 99b7e88255 am: 5698c8ea4d 
Change-Id: I49ebc6e173e4a14efb40902c7de54a95310d437e
 2020-04-23 16:19:07 +00:00
TreeHugger Robot
ee6c47cff8 Merge "Update prebuilt CTS shim pkgs with the ones built on server" into rvc-dev 2020-04-23 14:59:40 +00:00
Dario Freni
36e924c72b Update prebuilt CTS shim pkgs with the ones built on server 
frameworks/base/packages/CtsShim/apk/arm/CtsShim.apk
package: name='com.android.cts.ctsshim'
versionCode='29'
versionName='R-6416871'
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'R'
targetSdkVersion:'28'

frameworks/base/packages/CtsShim/apk/arm/CtsShimPriv.apk
package: name='com.android.cts.priv.ctsshim'
versionCode='29'
versionName='R-6416871'
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'R'
targetSdkVersion:'28'

frameworks/base/packages/CtsShim/apk/x86/CtsShim.apk
package: name='com.android.cts.ctsshim'
versionCode='29'
versionName='R-6416871'
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'R'
targetSdkVersion:'28'

frameworks/base/packages/CtsShim/apk/x86/CtsShimPriv.apk
package: name='com.android.cts.priv.ctsshim'
versionCode='29'
versionName='R-6416871'
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'R'
targetSdkVersion:'28'

Built here:
https://android-build.googleplex.com/builds/submitted/6416871/CtsShim_arm64/latest
https://android-build.googleplex.com/builds/submitted/6416871/CtsShim_x86_64/latest

This build is suitable for public release.

Bug: 148489495
Test: presubmit
Change-Id: I8e247a05bdb4a1b4572940362169fe8538a22399
 2020-04-22 12:36:32 +01:00
Jiyong Park
b50e662b3e Make CtsShim*Prebuilt be available to the test APEXes 
android_app_import now supports apex_available property. Fill the
property for the CtsShim*Prebuilt apks so that they can be correctly
included in the test APEXes.

Bug: 154488897
Test: m
Change-Id: I9cf2e30bb38abbb33bf76a0eab0dc2a10a5647c9
 2020-04-22 11:45:54 +09:00
TreeHugger Robot
636c0036c6 Merge "Make CtsPriv and CtsPrivShim build standalone." into rvc-dev am: 33b703b24c am: 5408719101 am: 678ff493c6 am: b8f8d7f255 
Change-Id: I3bd358385e8fe149f3a641e305abd2caff917a35
 2020-04-21 22:27:51 +00:00
Dario Freni
27fff59437 Make CtsPriv and CtsPrivShim build standalone. 
Bug: 148489495
Test: build/soong/soong_ui.bash --make-mode -j80 showcommands dist TARGET_BUILD_APPS='CtsShim CtsShimPriv CtsShimPrivUpgrade CtsShimPrivUpgradeWrongSHA CtsShimTargetPSdk'  TARGET_BUILD_VARIANT=userdebug TARGET_PRODUCT=aosp_arm64
Change-Id: I1bd43b7ef9b4ebd5a24712306285c0ffd0e34d23
 2020-04-21 20:29:07 +01:00
TreeHugger Robot
324bcc342c Merge "CtsShimTargetPSdk should build outside APEX too." into rvc-dev am: a16b8b31f8 am: 7b85ee9e08 am: 892a1171d8 am: 98c01ca1c9 
Change-Id: I0446e8630fdddaaac12a4f6ea04074664c3bae10
 2020-04-21 15:04:25 +00:00
Dario Freni
7e3234d133 CtsShimTargetPSdk should build outside APEX too. 
Bug: 148489495
Test: build/soong/soong_ui.bash --make-mode -j80 showcommands dist TARGET_BUILD_APPS='CtsShim CtsShimPriv CtsShimPrivUpgrade CtsShimPrivUpgradeWrongSHA CtsShimTargetPSdk'  TARGET_BUILD_VARIANT=userdebug TARGET_PRODUCT=aosp_arm64
Change-Id: I2236432bf029fb00ce7ed5fd399f474872f99d0b
 2020-04-21 13:52:33 +01:00
TreeHugger Robot
a791c7f2ef Merge "Make CtsShim targets available to cts shim apex." into rvc-dev am: 2bc67bea15 am: e5e2e35e0e am: efc6b9cb78 am: f9f8443777 
Change-Id: I6fe9086dbe69b809e838bbe04856126e42b04799
 2020-04-20 17:57:22 +00:00
Dario Freni
f2e402d6c2 Make CtsShim targets available to cts shim apex. 
Bug: 148489495
Test: mm
Change-Id: I781d0a778b58cb3b96bf421355c29e888f372a56
 2020-04-20 16:47:43 +01:00
Automerger Merge Worker
c908bf560b Merge "Merge "Fix package name and version code of ctsshim CtsShimTargetPSdk" into rvc-dev am: 1dbe4dfa3d am: 594fdd8654" into rvc-d1-dev-plus-aosp am: 9593c5de8f am: 7e32f3a781 
Change-Id: I99b1e8d2211805cc43384bcb6feb7cc16ce7fdbc
 2020-04-03 15:32:23 +00:00
Mohammad Samiul Islam
3cada82805 Fix package name and version code of ctsshim CtsShimTargetPSdk 
Bug: 152021141
Test: builds successfully
Change-Id: Id0dbe193b383c982e6e906237981541f496f839f
 2020-04-01 10:25:33 +01:00
Mohammad Samiul Islam
d880930d76 Merge "Create a shim apk which is malformed" into rvc-dev am: dcf4e5f441 am: 7e685ee6cd am: f1a816b5b8 am: edcfc5e18d 
Change-Id: I3747dedaf51bbee0f05fca6b1aac11d311b8aa70
 2020-03-31 05:36:11 +00:00
Mohammad Samiul Islam
57c68c7482 Create a shim apk which is malformed 
This shim-apk will be embedded in an apex to test out scenarios where
apk-in-apex fails to install.

Since this shim-apk is malformed, PackageManager will fail to parse it.
Hence it should not be possible to install this app at all. Hence I did
not add the hash of this shim-apk inside the manifest of shim-apk-v1
that comes pre-installed with device.

Bug: 152021141
Test: builds succesfully
Test: adb install CtsShimTargetPSdk.apk (fails to parse)
Change-Id: I3509009de62d38c5028185fe3588b674aa006e56
 2020-03-27 19:51:51 +00:00
Ashwini Oruganti
cde3954b70 CtsShim: Add an exported flag in manifest 
With b/150232615, we will need an explicit value set for the exported
flag when intent filters are present, as the default behavior is
changing for S+. This change adds the value reflecting the previous
default to the manifest.

Bug: 150232615
Test: TH
Change-Id: Ieab993508f18c148ca771df7faf7bbc845f52ad8
 2020-03-10 16:02:27 -07:00
Dario Freni
2fc64882f7 Convert Android.mk to Android.bp for CtsShim* 
Bug: 138429615
Test: File was mostly auto-generated via `androidmk`, except the
manifest generation bit. All modules verified to be compiling, and
correct hash verified beign present in the CtsShimPriv manifest:

$ sha512sum -b \
out/soong/.intermediates/frameworks/base/packages/CtsShim/build/CtsShimPrivUpgrade/android_common/CtsShimPrivUpgrade.apk
88828701aa191d9cfd7fe839bc0d0ba159e3c21dd85fb5bcd7d15e9e66ea7d88d8f6e2369a911b567571a6750e424f3c1424a927f8fde559535c7329778b7eb9

$ sha512sum -b \
out/soong/.intermediates/frameworks/base/packages/CtsShim/build/CtsShimPrivUpgradeWrongSHA/android_common/CtsShimPrivUpgradeWrongSHA.apk
55df1add673f13671e35de14540b427320f52fafff593c56e6dcc81d8b4fbde508d596edf8a326f764c58b70bcb94b63c6baacba1f8c6e4940c179a77dfc1ab1

$ aapt2 dump xmltree --file AndroidManifest.xml \
out/soong/.intermediates/frameworks/base/packages/CtsShim/build/CtsShimPriv/android_common/CtsShimPriv.apk \
| grep hash
        A:
	http://schemas.android.com/apk/res/android:hash(0x01010526)="88828701aa191d9cfd7fe839bc0d0ba159e3c21dd85fb5bcd7d15e9e66ea7d88d8f6e2369a911b567571a6750e424f3c1424a927f8fde559535c7329778b7eb9"
	(Raw:
	"88828701aa191d9cfd7fe839bc0d0ba159e3c21dd85fb5bcd7d15e9e66ea7d88d8f6e2369a911b567571a6750e424f3c1424a927f8fde559535c7329778b7eb9")

Change-Id: I9bb44a007324ab29ea60fb3ee06fc9ead42cdeba
Merged-In: Ie6e0df9f4f1365b5194e9748b325b421f838c65b
 2019-11-16 17:37:16 +08:00
Dario Freni
fa54812b1f Convert Android.mk to Android.bp for CtsShim* 
Bug: 138429615
Test: File was mostly auto-generated via `androidmk`, except the
manifest generation bit. All modules verified to be compiling, and
correct hash verified beign present in the CtsShimPriv manifest:

$ sha512sum -b \
out/soong/.intermediates/frameworks/base/packages/CtsShim/build/CtsShimPrivUpgrade/android_common/CtsShimPrivUpgrade.apk
88828701aa191d9cfd7fe839bc0d0ba159e3c21dd85fb5bcd7d15e9e66ea7d88d8f6e2369a911b567571a6750e424f3c1424a927f8fde559535c7329778b7eb9

$ sha512sum -b \
out/soong/.intermediates/frameworks/base/packages/CtsShim/build/CtsShimPrivUpgradeWrongSHA/android_common/CtsShimPrivUpgradeWrongSHA.apk
55df1add673f13671e35de14540b427320f52fafff593c56e6dcc81d8b4fbde508d596edf8a326f764c58b70bcb94b63c6baacba1f8c6e4940c179a77dfc1ab1

$ aapt2 dump xmltree --file AndroidManifest.xml \
out/soong/.intermediates/frameworks/base/packages/CtsShim/build/CtsShimPriv/android_common/CtsShimPriv.apk \
| grep hash
        A:
	http://schemas.android.com/apk/res/android:hash(0x01010526)="88828701aa191d9cfd7fe839bc0d0ba159e3c21dd85fb5bcd7d15e9e66ea7d88d8f6e2369a911b567571a6750e424f3c1424a927f8fde559535c7329778b7eb9"
	(Raw:
	"88828701aa191d9cfd7fe839bc0d0ba159e3c21dd85fb5bcd7d15e9e66ea7d88d8f6e2369a911b567571a6750e424f3c1424a927f8fde559535c7329778b7eb9")

Change-Id: Ie6e0df9f4f1365b5194e9748b325b421f838c65b
 2019-10-28 16:28:07 +00:00
Victor Hsieh
a0f95e3d31 Keep CtsShimPriv's v2/v3 signature 
The build system silently destroys APK's v2/v3 signature, even with the
PRESIGNED one.  This change prevents that.

Test: apksigner shows v2/v3 signature are reserved (after manual copy to
      the prebuilts)
Bug: 133505716
Change-Id: I34bab87157400b36bdf6a62f3c692523fcf2911c
 2019-05-29 13:42:28 -07:00
Todd Kennedy
90af96bf10 Update prebuilt shims 
Built here:
https://android-build.googleplex.com/builds/branch-dashboard/ub-ctsshim-dev?build_id=5374186

./arm/CtsShim.apk
package: name='com.android.cts.ctsshim'
versionCode='28'
versionName='9-5374186'
platformBuildVersionName='9'
platformBuildVersionCode='28'
compileSdkVersion='28'
compileSdkVersionCodename='9'
sdkVersion:'24'
targetSdkVersion:'28'

./arm/CtsShimPriv.apk
package: name='com.android.cts.priv.ctsshim'
versionCode='28'
versionName='9-5374186'
platformBuildVersionName='9'
platformBuildVersionCode='28'
compileSdkVersion='28'
compileSdkVersionCodename='9'
sdkVersion:'24'
targetSdkVersion:'28'

./x86/CtsShim.apk
package: name='com.android.cts.ctsshim'
versionCode='28'
versionName='9-5374186'
platformBuildVersionName='9'
platformBuildVersionCode='28'
compileSdkVersion='28'
compileSdkVersionCodename='9'
sdkVersion:'24'
targetSdkVersion:'28'

./x86/CtsShimPriv.apk
package: name='com.android.cts.priv.ctsshim'
versionCode='28'
versionName='9-5374186'
platformBuildVersionName='9'
platformBuildVersionCode='28'
compileSdkVersion='28'
compileSdkVersionCodename='9'
sdkVersion:'24'
targetSdkVersion:'28'

Bug: 121306802
Test: cts-tradefed run commandAndExit cts-dev --module CtsAppSecurityHostTestCases --test android.appsecurity.cts.PrivilegedUpdateTests
Change-Id: I70cd5154cd48117bdc5cf8a8714602ef8a7921d4
 2019-05-22 13:55:12 -07:00
Todd Kennedy
dc65b65666 Change target SDK to '28' 
am: b0103b5ebb

Change-Id: If4e9acb9fef17a38013d532196a06091446f5bb2
 2019-03-13 16:49:14 -07:00
Todd Kennedy
b0103b5ebb Change target SDK to '28' 
Bug: 121306802
Test: none
Change-Id: I3e7302ab42987c177f9e538fd7fdf66c35f0bb79
 2019-03-13 13:37:33 -07:00