Tao Bao
db537d5eae
Merge "releasetools: Factor out the check for (compressed) APK file." am: 2ba547a1c7 am: 023b5104d7
...
am: dae65898f2
2018-06-20 09:25:17 -07:00
Tao Bao
dae65898f2
Merge "releasetools: Factor out the check for (compressed) APK file." am: 2ba547a1c7
...
am: 023b5104d7
2018-06-20 09:21:36 -07:00
Tao Bao
023b5104d7
Merge "releasetools: Factor out the check for (compressed) APK file."
...
am: 2ba547a1c7
2018-06-20 09:18:56 -07:00
Tao Bao
2ba547a1c7
Merge "releasetools: Factor out the check for (compressed) APK file."
2018-06-20 16:11:04 +00:00
Anton Hansson
236a99f1e1
[automerger skipped] Merge "Delete core_tiny.mk" into stage-aosp-master am: b40cd42eeb -s ours
...
am: 8893989a9f
2018-06-20 07:16:03 -07:00
Anton Hansson
8893989a9f
[automerger skipped] Merge "Delete core_tiny.mk" into stage-aosp-master
...
am: b40cd42eeb
2018-06-20 07:12:55 -07:00
Anton Hansson
d4f0e3c40d
[automerger skipped] Merge "Delete core_tiny.mk" into pi-dev-plus-aosp
...
am: 50143ef065
2018-06-20 07:11:09 -07:00
Anton Hansson
767e8b181f
[automerger skipped] Delete core_tiny.mk
...
am: 552dcaf7d9
2018-06-20 07:10:23 -07:00
Anton Hansson
b40cd42eeb
Merge "Delete core_tiny.mk" into stage-aosp-master
2018-06-20 14:07:14 +00:00
Anton Hansson
50143ef065
Merge "Delete core_tiny.mk" into pi-dev-plus-aosp
2018-06-20 14:02:40 +00:00
Anton Hansson
11be1c27dd
Merge "Delete core_tiny.mk"
2018-06-20 13:37:35 +00:00
Jiyong Park
d8222c1a3d
Merge "Export SDK library names" am: dabf1a0c5a am: 56be041198
...
am: 66c27e5411
2018-06-20 01:40:09 -07:00
Bo Hu
866af5afae
Merge "Revert "Revert "emulator: base sdk_phone_armv7/64 on aosp""" am: 9379de6756 am: c2c164504d
...
am: 33b7ff0347
2018-06-20 01:38:55 -07:00
Jiyong Park
66c27e5411
Merge "Export SDK library names" am: dabf1a0c5a
...
am: 56be041198
2018-06-20 01:27:05 -07:00
Bo Hu
33b7ff0347
Merge "Revert "Revert "emulator: base sdk_phone_armv7/64 on aosp""" am: 9379de6756
...
am: c2c164504d
2018-06-20 01:25:40 -07:00
Jiyong Park
56be041198
Merge "Export SDK library names"
...
am: dabf1a0c5a
2018-06-20 01:14:56 -07:00
Bo Hu
c2c164504d
Merge "Revert "Revert "emulator: base sdk_phone_armv7/64 on aosp"""
...
am: 9379de6756
2018-06-20 01:14:00 -07:00
Treehugger Robot
dabf1a0c5a
Merge "Export SDK library names"
2018-06-20 05:40:09 +00:00
Bo Hu
9379de6756
Merge "Revert "Revert "emulator: base sdk_phone_armv7/64 on aosp"""
2018-06-20 05:04:22 +00:00
bohu
19481ce902
Revert "Revert "emulator: base sdk_phone_armv7/64 on aosp""
...
This reverts commit c82af2f6a9
2018-06-19 21:32:05 -07:00
Jiyong Park
1cf8ee619b
Export SDK library names
...
A java module exports SDK library names that it is using directly or
indirectly via its dependencies. Manifest fixer uses the SDK lib names
to automatically add <uses-library> tags for the apk.
The SDK library names are exported via exported-sdk-libs file in make.
From Soong, they are exported via LOCAL_EXPORT_SDK_LIBRARIES flag.
Bug: 77575606
Test: m -j
Change-Id: I4e7a9bdc5bf845af85168abf55f8063900bacc72
2018-06-20 11:50:06 +09:00
Bo Hu
c83dcc27d3
Merge "Revert "emulator: base sdk_phone_armv7/64 on aosp"" am: 6291a4a258 am: 31e612afb3
...
am: f43a1913d1
2018-06-19 15:59:02 -07:00
Bo Hu
f43a1913d1
Merge "Revert "emulator: base sdk_phone_armv7/64 on aosp"" am: 6291a4a258
...
am: 31e612afb3
2018-06-19 15:47:53 -07:00
Bo Hu
31e612afb3
Merge "Revert "emulator: base sdk_phone_armv7/64 on aosp""
...
am: 6291a4a258
2018-06-19 15:41:39 -07:00
Bo Hu
6291a4a258
Merge "Revert "emulator: base sdk_phone_armv7/64 on aosp""
2018-06-19 22:25:31 +00:00
Bo Hu
c82af2f6a9
Revert "emulator: base sdk_phone_armv7/64 on aosp"
...
This reverts commit b12abf0310
2018-06-19 22:19:47 +00:00
Tao Bao
11f955c506
releasetools: Factor out the check for (compressed) APK file.
...
Test: Run sign_target_files.py to sign a target_files.zip.
Test: `python -m unittest test_sign_target_files_apks`
Change-Id: Ie795d1bce7bae6af427832283e3d10bfecad80c5
2018-06-19 14:50:23 -07:00
Bo Hu
74697993c0
[automerger skipped] Merge "emulator: base sdk_phone_armv7/64 on aosp" am: 5ce1e519ea am: 2ed87d0137 -s ours
...
am: df419cb1e4
2018-06-19 14:16:12 -07:00
Kevin Chyn
36f11e4bbd
Merge "Added android.hardware.biometrics.face to VNDK"
2018-06-19 20:55:55 +00:00
Dan Willemsen
028b782d5f
Merge changes I101ced40,If9a4bed2 am: 949404a65b am: faad18291a
...
am: 0e32442652
2018-06-19 13:48:28 -07:00
Bo Hu
df419cb1e4
[automerger skipped] Merge "emulator: base sdk_phone_armv7/64 on aosp" am: 5ce1e519ea
...
am: 2ed87d0137
2018-06-19 13:48:12 -07:00
Dan Willemsen
0e32442652
Merge changes I101ced40,If9a4bed2 am: 949404a65b
...
am: faad18291a
2018-06-19 13:45:10 -07:00
Bo Hu
2ed87d0137
Merge "emulator: base sdk_phone_armv7/64 on aosp"
...
am: 5ce1e519ea
2018-06-19 13:45:04 -07:00
Dan Willemsen
faad18291a
Merge changes I101ced40,If9a4bed2
...
am: 949404a65b
2018-06-19 13:42:23 -07:00
Vishwath Mohan
8575106e0e
Merge "Add Scudo support for Make" am: ab0c76c869 am: 969a880b2f
...
am: 27a7c9369b
2018-06-19 13:41:15 -07:00
Bo Hu
5ce1e519ea
Merge "emulator: base sdk_phone_armv7/64 on aosp"
2018-06-19 20:39:26 +00:00
Dan Willemsen
949404a65b
Merge changes I101ced40,If9a4bed2
...
* changes:
Fix PHONY uses found by --warn_real_to_phony
Fix vndk packaging to stop depending on phony targets
2018-06-19 20:35:57 +00:00
Colin Cross
84298f8fa5
Merge "Merge "Revert "Revert "Inject minSdkVersion from the build system""" am: aac18a02d9" into stage-aosp-master am: d7cf905f1f
...
am: 394665a08b
2018-06-19 13:32:21 -07:00
Vishwath Mohan
27a7c9369b
Merge "Add Scudo support for Make" am: ab0c76c869
...
am: 969a880b2f
2018-06-19 13:24:32 -07:00
Makoto Onuki
665a2a303a
[automerger skipped] atest: switch from a shell function to binary am: cd20160644
...
am: 12a96ff4ed
2018-06-19 13:16:55 -07:00
Colin Cross
394665a08b
Merge "Merge "Revert "Revert "Inject minSdkVersion from the build system""" am: aac18a02d9" into stage-aosp-master
...
am: d7cf905f1f
2018-06-19 13:15:44 -07:00
Makoto Onuki
12a96ff4ed
atest: switch from a shell function to binary
...
am: cd20160644
2018-06-19 13:13:49 -07:00
Vishwath Mohan
969a880b2f
Merge "Add Scudo support for Make"
...
am: ab0c76c869
2018-06-19 13:12:40 -07:00
Android Build Merger (Role)
d7cf905f1f
Merge "Merge "Revert "Revert "Inject minSdkVersion from the build system""" am: aac18a02d9" into stage-aosp-master
2018-06-19 20:11:16 +00:00
Colin Cross
4b96d34443
Merge "Revert "Revert "Inject minSdkVersion from the build system"""
...
am: aac18a02d9
2018-06-19 13:06:41 -07:00
Vishwath Mohan
ab0c76c869
Merge "Add Scudo support for Make"
2018-06-19 19:09:56 +00:00
bohu
b12abf0310
emulator: base sdk_phone_armv7/64 on aosp
...
Switch to GSI images for arm/arm64 sdk images.
BUG: 79941736
This cl does not impact real device images
Test: make -j110 PRODUCT-sdk_phone_armv7-sdk showcommands dist \
DIST_DIR=git_master-without-vendor-linux-sdk_x86-sdk sdk_repo
Change-Id: Ia50be068cc5e5307cdf7ee3a8e11014ed8019992
Merged-In: Ia50be068cc5e5307cdf7ee3a8e11014ed8019992
2018-06-19 11:51:31 -07:00
Makoto Onuki
cd20160644
atest: switch from a shell function to binary
...
Test: m -j, do envsetup.sh in a clean shell, run atest
Change-Id: I868d24176538397a592d20a4d5082170b91c9ae4
Merged-In: I868d24176538397a592d20a4d5082170b91c9ae4
2018-06-19 11:38:15 -07:00
Colin Cross
aac18a02d9
Merge "Revert "Revert "Inject minSdkVersion from the build system"""
2018-06-19 18:14:39 +00:00
Kostya Kortchinsky
2cfa99722b
Add Scudo support for Make
...
Scudo is a hardened usermode allocator that is part of LLVM's compiler-rt
project (home of the Sanitizers). clang allows for -fsanitize=scudo as a
possible command line option to link the shared Scudo library to a binary.
This patch add Scudo as a potential sanitize option. Scudo is not compatible
with ASan and TSan and will be disabled if either is enabled.
Test: aosp compiled with m -j
Test: local experiment with LOCAL_SANITIZE := scudo to ensure that a test
target (mediaserver) could be linked with scudo.
Change-Id: I462843b9d5512fba2c4a3ac1a0c356ca90bce4e5
2018-06-19 09:46:35 -07:00
