Remi NGUYEN VAN
ff51a362fd
Merge "Add a product build var for mainline module certs"
...
am: a7832d5543
Change-Id: I00c77685a3b630049a2f578258d54cdc6e973e3a
2019-08-15 01:11:22 -07:00
Treehugger Robot
a7832d5543
Merge "Add a product build var for mainline module certs"
2019-08-15 07:43:46 +00:00
Xin Li
c801230025
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master"
...
am: c2852177bb
-s ours
am skip reason: subject contains skip directive
Change-Id: I31703244f0d5dec81d43625277ef1bce4d6ad570
2019-08-14 23:29:27 -07:00
Treehugger Robot
c2852177bb
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master"
2019-08-15 06:13:48 +00:00
Tao Bao
03e726ce10
[automerger skipped] Merge "Makefile uses add_img_to_target_files module."
...
am: 27480a0cf4
-s ours
am skip reason: change_id Ia21d143ca42b1cae8f04b5f0e0cdf6b719312117 with SHA1 c1966a8bdd
is in history
Change-Id: Ia777279685dc98bb7490380db88a31f32dac5921
2019-08-14 21:53:30 -07:00
Tao Bao
27480a0cf4
Merge "Makefile uses add_img_to_target_files module."
2019-08-15 04:27:08 +00:00
Hsin-Yi Chen
a489b755a0
Merge "Add tags to lsdump_paths.txt"
...
am: 7205361315
Change-Id: I4874b39acd4727e6969c8ddb235c773c46ee8972
2019-08-14 19:44:40 -07:00
Hsin-Yi Chen
7205361315
Merge "Add tags to lsdump_paths.txt"
2019-08-15 02:20:30 +00:00
android-build-team Robot
2601387d19
Version bump to QP1A.191005.002 [core/build_id.mk]
...
Change-Id: I2dcdbaa3b1ca79f5938aaf40550713bef2d01ecd
2019-08-15 01:39:58 +00:00
android-build-team Robot
0099de405c
Make change and version bump to QP1A.191005.001
...
Change-Id: I885bcf1f8fb465aaf3f502720923c9c55eb603c7
2019-08-14 23:27:11 +00:00
Paul Scovanner
f8d5a613e8
Update Security Strings to 2019-10-05
...
Bug:139434268
Change-Id: I063f0430347d9f1e6ea5a8133204585833ed5ddc
(cherry picked from commit 84633edb22
)
2019-08-14 23:24:45 +00:00
Bill Peckham
861ffd1588
Merge "Avoid adding VINTF manifest fragment more than once."
...
am: fd25038f8a
Change-Id: I44c12257269e039c78f20330fa5713775fec3b65
2019-08-14 16:04:02 -07:00
Bill Peckham
fd25038f8a
Merge "Avoid adding VINTF manifest fragment more than once."
2019-08-14 22:44:30 +00:00
Tao Bao
0a712a0834
Merge "Makefile uses add_img_to_target_files module." into stage-aosp-master
2019-08-14 21:46:17 +00:00
Xin Li
5e0e14531d
DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master
...
Bug: 134405016
Change-Id: I77df4ab2e9f680668c903a55394743b313082620
2019-08-14 11:35:07 -07:00
Tao Bao
c1966a8bdd
Makefile uses add_img_to_target_files module.
...
Also pack additional tools into otatools.zip.
Bug: 63866463
Test: TreeHugger
Test: `m -j otatools-package`; Check the packed tools.
Change-Id: Ia21d143ca42b1cae8f04b5f0e0cdf6b719312117
(cherry picked from commit 1cf8bf0c14
)
2019-08-14 10:44:53 -07:00
Tao Bao
1cf8bf0c14
Makefile uses add_img_to_target_files module.
...
Also pack additional tools into otatools.zip.
Bug: 63866463
Test: TreeHugger
Test: `m -j otatools-package`; Check the packed tools.
Change-Id: Ia21d143ca42b1cae8f04b5f0e0cdf6b719312117
Merged-In: Ia21d143ca42b1cae8f04b5f0e0cdf6b719312117
2019-08-14 10:34:59 -07:00
Tao Bao
f4157c5859
Merge "releasetools: Add more module building rules."
...
am: 39369d08fb
Change-Id: Ic422023eceae40922a6251f32982cc1141f86aac
2019-08-14 09:08:50 -07:00
Tao Bao
39369d08fb
Merge "releasetools: Add more module building rules."
2019-08-14 15:33:33 +00:00
nelsonli
e7b71a18a4
VTS: Add vts-core to the dependency of tests
...
Bug: 137921421
Test: (1) m tests
(2) check vts-core-tests.zip
For migrating most existing VTS test to executable by Base TradeFed, we have to
create vts-core suite and test all of the modules in vts-core first.
And add the packaging rules for vts-core suite.
Bug: 137921421
Change-Id: Ifc92db205c78db98abf704aa6dfa50f1f77e983d
2019-08-14 09:47:21 +08:00
android-build-team Robot
f31b1706bd
Version bump to QP1A.190711.020 [core/build_id.mk]
...
Change-Id: I7d6a93de1023aede26137adeba5eb69cc67c8821
2019-08-14 00:24:13 +00:00
Colin Cross
869febddb9
Make javamicro a plugin
...
Treat LOCAL_PROTOC_OPTIMIZE_TYPE := javamicro as a plugin by
explicitly passing the path to protoc-gen-javamicro. This allows
removing the javamicro customizations from the core plugin code.
Bug: 117607748
Test: m checkbuild
Change-Id: I199f47a64a454594a2fff4c5580c53fd17e0bdee
2019-08-13 16:58:45 -07:00
Xin Li
bcb39c6c34
DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master
...
Bug: 139369544
Change-Id: I205bd2801280b265407a31ec283c2ff9265b9a0a
2019-08-13 16:43:29 -07:00
Bill Peckham
6733381fce
Avoid adding VINTF manifest fragment more than once.
...
In the case of building a multilib library that defines LOCAL_VINTF_FRAGMENTS,
the previous code would create duplicate rules for the fragment. This change
uses the my_vintf_new_installed variable (which may be empty) to avoid the
duplication.
Bug: 139268165
Test: Verify that build warnings are gone, yet VINTF fragment still installed.
Change-Id: I579ec650019a29a6a105118ad5e5ae9376e8d9bc
2019-08-13 16:05:34 -07:00
Dan Albert
d892b63a1d
Link libc++demangle with libc++ for the device.
...
libc++demangle provides __cxa_demangle, which used to be a part of
libc++.so but is being moved out to save on resources since very few
libraries need it.
Test: make checkbuild
Bug: http://b/138245375
Change-Id: I677006dbbe87ccf2dd4df182114d2a6b985e3c00
2019-08-13 13:15:04 -07:00
Ramy Medhat
eef0efadb3
Merge "Add labels to rewrapper cc compile action. Prevent ccwrapper from being used in links."
...
am: f51a70b009
Change-Id: I08921d50243c3984a2edd518750465b58896b4d9
2019-08-13 10:48:10 -07:00
Ramy Medhat
f51a70b009
Merge "Add labels to rewrapper cc compile action. Prevent ccwrapper from being used in links."
2019-08-13 17:17:05 +00:00
android-build-team Robot
3ca130e871
Make change and version bump to PPRL.190801.002
...
Change-Id: I2f623d5f6e2a908aee4b3988df20179a3095a330
2019-08-13 16:39:58 +00:00
Roland Levillain
7672ab85d9
Rename Soong variable FlattenApex
as Flatten_apex
.
...
This is so that it can be used as a Soong/Blueprint property.
Test: m
Bug: 139277987
Change-Id: I009817e040994738814c92ee007aec9ef2cfa838
2019-08-13 15:07:44 +01:00
Paul Trautrim
bc3600c030
Use --add_missing in merge_target_files.py
...
This is needed when including prebuilt images that do not need to be
regenerated. Otherwise the script will exit upon detecting an existing
IMAGES/ directory.
Test: test_merge_target_files
Bug: 139111475
Change-Id: I55d82bd7dc4fa5f27bc01e481362e79fecc200ff
2019-08-13 19:24:12 +09:00
Paul Trautrim
4e14323a31
Add PRODUCT_BUILD_VBMETA_IMAGE to control vbmeta generation
...
In line with the existing PRODUCT_BUILD_*_IMAGE variables, add a flag to
control whether vbmeta is generated.
Bug: 139328573
Test: manual
Change-Id: Id71026f9b0de9019e82e8ef594e718a4b0f3628f
2019-08-13 16:43:39 +09:00
Ramy Medhat
e5839f912b
Add labels to rewrapper cc compile action. Prevent ccwrapper from being
...
used in links.
Test: Built aosp-arm64_eng with and without USE_RBE=1
Change-Id: I8d04069219a9467c3de9a028eb68e3115173f1e2
2019-08-12 14:13:31 -04:00
vichang
940002a285
Merge "Add new core-icu4j after separating icu4j from core-libart"
...
am: ba6135bd80
Change-Id: Iba62deb4e2bb8c906fd30baa074ba43a8d19ac62
2019-08-12 09:11:26 -07:00
vichang
ba6135bd80
Merge "Add new core-icu4j after separating icu4j from core-libart"
2019-08-12 15:36:44 +00:00
Inseob Kim
731737b92d
Merge "Include headers and props to VNDK snapshot"
...
am: 3ca61ad9d9
Change-Id: Ibb2d23dfb79350fed1351020144e3a538d6ab160
2019-08-11 16:21:09 -07:00
Treehugger Robot
3ca61ad9d9
Merge "Include headers and props to VNDK snapshot"
2019-08-11 23:04:49 +00:00
Dan Willemsen
2b5e4acc6c
Merge "Add dependencies for files in LOCAL_PROGUARD_FLAGS"
...
am: 2a36c97edd
Change-Id: I5584988f662c8c6845da3d4214a5ff1db9b0ed6e
2019-08-09 14:49:54 -07:00
Yifan Hong
461a045c21
Merge "Add virtual A/B product."
...
am: f555602f57
Change-Id: I500dc67078d199e98d082df51f2af7192cc3c9bf
2019-08-09 14:47:47 -07:00
Treehugger Robot
2a36c97edd
Merge "Add dependencies for files in LOCAL_PROGUARD_FLAGS"
2019-08-09 21:31:32 +00:00
Yifan Hong
f555602f57
Merge "Add virtual A/B product."
2019-08-09 21:25:36 +00:00
Dan Willemsen
184305d9e9
Merge "Move TOP/TOPDIR to build/make/common/core.mk"
...
am: d1e2827fa5
Change-Id: I1a6270ad561b6479e8e9d012f671168d7882c9e4
2019-08-09 09:49:25 -07:00
Treehugger Robot
d1e2827fa5
Merge "Move TOP/TOPDIR to build/make/common/core.mk"
2019-08-09 16:29:14 +00:00
Dan Willemsen
829abaefee
Add dependencies for files in LOCAL_PROGUARD_FLAGS
...
Do this by introducing a new LOCAL_PROGUARD_FLAGS_DEPS variable that we
can modify anytime we add a file reference to LOCAL_PROGUARD_FLAGS.
An alternative would have been to switch to LOCAL_PROGUARD_FLAG_FILES,
but that would have been much harder to ensure the same command line
ordering.
Bug: 130111713
Test: treehugger
Change-Id: If367197b30d563e0796f0cafa00be1f275f2c406
2019-08-09 09:19:52 -07:00
Colin Cross
f272adb168
Use more variables from Soong
...
Remove more copies of variables that are computed by Soong.
Test: m checkbuild
Change-Id: If78d4650438cc91d00c691db2fc97c5b790d5648
2019-08-09 08:40:30 -07:00
Tao Bao
cd79edb331
Merge "releasetools: Fix the target files diffing."
...
am: 6a52b34473
Change-Id: I852a255f7ad99718a96bae0df92ce54ceb543c0a
2019-08-08 16:35:04 -07:00
Tao Bao
6a52b34473
Merge "releasetools: Fix the target files diffing."
2019-08-08 22:55:45 +00:00
android-build-team Robot
475fb5e5aa
Version bump to QP1A.190711.019 [core/build_id.mk]
...
Change-Id: Ibd7130d717e924d1a8ce7d2333f7124db90bb605
2019-08-08 21:26:47 +00:00
Dan Willemsen
8da52d4b9d
Move TOP/TOPDIR to build/make/common/core.mk
...
So that they're set properly during dumpvars / product loading.
SHELL is already set in common/core.mk, so it's not necessary to be in
core/main.mk as well (which quickly loads core/config.mk, which loads
common/core.mk).
Test: get_build_var TOP
Test: get_build_var TOPDIR
Change-Id: I8179ac32628b74ccf29851dc53bf83cfb4b280fd
2019-08-08 10:58:09 -07:00
Steven Moreland
4880e3cfdd
Merge "-D__ANDROID_NDK__ for SDK builds."
...
am: 0b690ed6d9
Change-Id: Ibe48a4cf8e94077597926912b09b12ae3724a396
2019-08-08 09:56:08 -07:00
Steven Moreland
0b690ed6d9
Merge "-D__ANDROID_NDK__ for SDK builds."
2019-08-08 16:22:53 +00:00