Commit Graph

58043 Commits

Author SHA1 Message Date
Dan Willemsen
8e080ccefe Merge "Export list of "installable" files to soong_ui"
am: 99202ec0a6

Change-Id: I252f4748396572d4b6c0f26148dc51b0c01b2f9e
2020-01-03 21:19:55 -08:00
Treehugger Robot
99202ec0a6 Merge "Export list of "installable" files to soong_ui" 2020-01-04 05:16:24 +00:00
Dan Willemsen
dec6e8e056 Export list of "installable" files to soong_ui
These are a (partial) list of files that we'd install with a default
build. The idea is that if something is removed from this list, soong_ui
can remove it from the installed location before running ninja.

It's okay if there are things missing from this list, it's not intended
to be a 100% solution replacing installclean / CleanSpec.mk, just
something that handles 80% of the cases without user involvement.

In particular, if something is removed from PRODUCT_PACKAGES, we'll
remove it from disk, but not necessarily rebuild the image files. That's
the same as most use cases of CleanSpec.mk today, and often some other
change will trigger the necessary images to be rebuilt.

We should be able to fix that by changing all of the image creation
rules to depend on the (partial) list of files they care about, or by
fixing ninja to rebuild things when their list of dependencies change.
(Other tools run into this same problem)

The list of test files is also included so that we can remove obsolete
tests from their "installed" locations within test suites and the
testcases folders.

Test: remove a module from PRODUCT_PACKAGES, see the print and file removed
Test: change the name of a cts test, see the old one removed from cts
Change-Id: I67f270a6713369099ca523aaf991ee3beb815c0a
2020-01-03 19:19:11 -08:00
android-build-team Robot
0108215cc6 Make change and version bump to QQ2A.200104.001
Change-Id: I9985323bb6a17ccb78722de3a4ca46905b0be58e
2020-01-04 02:22:13 +00:00
Automerger Merge Worker
d57b01a563 Merge "Add BUILD_BROKEN_NINJA_USES_ENV_VARS" am: f29df793c9 am: a9bfb4faba
Change-Id: Ifd7b3b990d66080dd091098955552a8f4018b7c5
2020-01-04 02:20:21 +00:00
Dan Willemsen
a9bfb4faba Merge "Add BUILD_BROKEN_NINJA_USES_ENV_VARS"
am: f29df793c9

Change-Id: Iae9ee9bbb18a153000e37204236e653465aba018
2020-01-03 18:04:04 -08:00
Treehugger Robot
f29df793c9 Merge "Add BUILD_BROKEN_NINJA_USES_ENV_VARS" 2020-01-04 01:32:40 +00:00
Automerger Merge Worker
de4fd03ad9 Merge "Add Soong android_app and android_test modules to javac-check" am: 6e54952b44 am: 253f31621e
Change-Id: I45850d29610778d8fad9b415d7b11d71446cad56
2020-01-03 19:37:22 +00:00
Colin Cross
253f31621e Merge "Add Soong android_app and android_test modules to javac-check"
am: 6e54952b44

Change-Id: I5ca7e4bd210a66aaeb305ab7ab326683ef89ea0b
2020-01-03 11:23:43 -08:00
Treehugger Robot
6e54952b44 Merge "Add Soong android_app and android_test modules to javac-check" 2020-01-03 19:20:14 +00:00
Automerger Merge Worker
61e7c87b5c [automerger skipped] Merge "DO NOT MERGE - Merge QQ1A.200105.003 into stage-aosp-master" into stage-aosp-master am: e074e6a01e -s ours
am skip reason: Change-Id I7e4e99e0da7387b13c94059b7ab1beb98ac47591 with SHA-1 5eb7b066a1 is in history

Change-Id: I48c28f17e4e1199cdb86e445c7faa797438b832c
2020-01-03 18:06:49 +00:00
TreeHugger Robot
e074e6a01e Merge "DO NOT MERGE - Merge QQ1A.200105.003 into stage-aosp-master" into stage-aosp-master 2020-01-03 17:50:03 +00:00
Dan Willemsen
2607625f8b Add BUILD_BROKEN_NINJA_USES_ENV_VARS
See the Changes.md and the paired soong change for more information.

Test: Add BUILD_BROKEN_NINJA_USES_ENV_VARS := OLDPWD
      ALLOW_NINJA_ENV=false m nothing; check out/soong.log
Change-Id: I2167eac52166b513318bc48feb71c9d0b80e5fd4
2020-01-02 20:09:25 -08:00
android-build-team Robot
a87aa85584 Make change and version bump to QQ2A.200103.001
Change-Id: I2dc71ff565f0555b37edb4bfeb4ab4baeb5c4607
2020-01-03 02:21:10 +00:00
Xin Li
68446d2662 DO NOT MERGE - Merge QQ1A.200105.003 into stage-aosp-master
Merged-In: I7e4e99e0da7387b13c94059b7ab1beb98ac47591
Change-Id: I2b18bf376c9d5ce988be10cabdf328f53a78ecab
2020-01-02 23:03:40 +00:00
Automerger Merge Worker
ae53351e8c Merge "Handle virtual A/B defines during dynamic_partitions_info merge." am: 9d4a90ef4b am: d5e0c4761f
Change-Id: I76a7987fda6084273cfc45468249dfd59677b00c
2020-01-02 21:50:59 +00:00
P Adarsh Reddy
d5e0c4761f Merge "Handle virtual A/B defines during dynamic_partitions_info merge."
am: 9d4a90ef4b

Change-Id: I93659811499f3f2b8a3d2e88be08b9c9ec48aecf
2020-01-02 13:38:22 -08:00
Treehugger Robot
9d4a90ef4b Merge "Handle virtual A/B defines during dynamic_partitions_info merge." 2020-01-02 21:33:48 +00:00
Josh Gao
552b3f96b2 Add libfdtrack to base_system.
Bug: http://b/140703823
Test: manual
Change-Id: I6015946b85a4564b82eb57a0a0a9bb1e058b100a
2020-01-02 12:44:52 -08:00
Robin Lee
34ea73940e Go one directory up looking for releasetools path
Change I366099c3dfd5fa4282745ef258a8cf35338e1e42 introduced a more
restricted search where we only look in out/host/x/bin instead of
out/host/x when looking for files.

Because signapk is in out/host/x/framework, and lib64 is in out/host/x,
we need to go one level up for this to work properly.

Fix: 147096688
Test: atest --host releasetools_test releasetools_py3_test
Change-Id: I597e1d95c09eb0e27b2faebb107218761901d9ac
2020-01-02 19:25:20 +00:00
android-build-team Robot
990fb07126 Make change and version bump to QQ2A.200102.001
Change-Id: I830060372a7cd1594e7bb46318774db4cc09fc85
2020-01-02 02:21:41 +00:00
android-build-team Robot
bfac67c8b0 Make change and version bump to QQ2A.200101.001
Change-Id: Ie6e012ce396c82c2c3f4a16648710c3472f416d1
2020-01-01 02:21:16 +00:00
Colin Cross
8e28a17bfe Add Soong android_app and android_test modules to javac-check
android_app and android_test modules were not built as part of
javac-check, which resulted in not running them in the Error Prone
build.

Fixes: 146455923
Test: m RUN_ERROR_PRONE=true javac-check
Change-Id: I278d7ee0cdc3f49aa8fa4d4f13309e29d700f2ba
2019-12-30 22:08:07 -08:00
android-build-team Robot
042312a5ac Make change and version bump to QQ2A.191231.001
Change-Id: Ib7da82533aa39eb426c61387771dbdfbd52c136c
2019-12-31 02:21:09 +00:00
Yo Chiang
4a5ff18a01 Clean up TARGET_FLATTEN_APEX lines in mainline products
Remove redundant TARGET_FLATTEN_APEX lines from mainline board configs.
Remove redundant "inherit updatable_apex.mk" lines from
mainline_system_$arch makefiles.
mainline_system.mk now always install APEX into /system partition.
Products who need flattened APEXes would have their flattened APEXes
installed into /system_ext.

Test: Build mainline_system_arm64 and validate noop
Change-Id: I9ee4af529a4bd554cb8707cfc260d6b912fd5fff
2019-12-30 16:19:28 +08:00
Jiyong Park
aeda4b267b Revert "Add boringssl_self_test to PRODUCT_PACKAGES"
This reverts commit ac4a35f017.

The change is not required because the conscrypt APEX now has
'boringssl_self_test' as its required modules.

Bug: 146549048
Test: m && device boots
2019-12-30 16:58:34 +09:00
android-build-team Robot
a0f99511be Make change and version bump to QQ2A.191230.001
Change-Id: I1a701281893ff419df6780db19ef2bee14d14ad2
2019-12-30 00:21:27 +00:00
android-build-team Robot
d812407248 Make change and version bump to QQ2A.191229.001
Change-Id: Ie9e77acdac652793af41d2b44d6d65817cb2da6f
2019-12-29 00:22:11 +00:00
android-build-team Robot
797fc475be Make change and version bump to QQ2A.191228.001
Change-Id: I12877995973db63d0819a874da594349357e5863
2019-12-28 02:19:33 +00:00
Automerger Merge Worker
f037120754 Merge "Add Multidisplay App and so to whitelist" into qt-qpr1-dev am: dd82625f27
Change-Id: Ic853e3d5fd0e9f4725062995ce34b06feb09a8f2
2019-12-27 16:01:39 +00:00
Automerger Merge Worker
4e3a78ff3b Merge "Stop removing valid copy headers" am: 4506b17dd3 am: 04b25efc91
Change-Id: Ife2bd4fd3526828b667a591415e7f4689c325aa2
2019-12-27 02:37:58 +00:00
android-build-team Robot
c3728a0d4d Make change and version bump to QQ2A.191227.001
Change-Id: I89a33e11f7e8852b599d5cb55e20850ed10b89a2
2019-12-27 02:20:29 +00:00
Dan Willemsen
04b25efc91 Merge "Stop removing valid copy headers"
am: 4506b17dd3

Change-Id: I0387d8c5106a41d4ad91cf87c0c5f0520255da7b
2019-12-26 18:20:15 -08:00
Treehugger Robot
4506b17dd3 Merge "Stop removing valid copy headers" 2019-12-27 02:15:26 +00:00
Dan Willemsen
13cb165b91 Stop removing valid copy headers
My change to clean up obsolete copy headers would remove valid ones if
thhe LOCAL_COPY_HEADERS_TO path wasn't cleaned. I'm seeing this most
with values that just end in '/', so we end up with a '//' in the path,
which isn't textually equivalent, and we remove it.

Test: No longer seeing constant removals on internal products
Test: Set LOCAL_COPY_HEADERS_TO := ..
Test: Set LOCAL_COPY_HEADERS_TO := ../foo
Test: Set LOCAL_COPY_HEADERS_TO := /foo
Change-Id: Idbeeb207a2bb2a8da766473dbded877cec7c9cc1
2019-12-26 16:52:34 -08:00
Automerger Merge Worker
1785dcfe52 Merge "Do not build ld.config.txt" am: f1ef5591f1 am: 63e1d4d899
Change-Id: I1bb0689958d9af85e9b78a8c832f13887a889197
2019-12-27 00:25:03 +00:00
Kiyoung Kim
63e1d4d899 Merge "Do not build ld.config.txt"
am: f1ef5591f1

Change-Id: Ifa83410715aef02b24f8524c1234222b2695c833
2019-12-26 16:10:59 -08:00
Kiyoung Kim
f1ef5591f1 Merge "Do not build ld.config.txt" 2019-12-27 00:08:06 +00:00
Jeff Davidson
4c443e1d4e Revert submission 1182953-1576003954286-8455af5a
Reason for revert: Crashes telephony process when saving XML config from carrier apps (b/146727232)
Reverted Changes:
Ieaeec41f1: Whitelist telephony-common, ims-common.
I5588f7615: Add telephony-common, ims-common to telephony apex...
I81e922c0d: Add telephony-common, ims-common to telephony apex...

Change-Id: Ia64b73682fcc77db63e220867c66c4319c417582
Merged-In: Ia64b73682fcc77db63e220867c66c4319c417582
2019-12-26 23:27:33 +00:00
Automerger Merge Worker
541c3e98cf Merge "unbreak sdk_phone_x86 boot" am: 7c18a37147 am: d3e86cfd66
Change-Id: Ifca20d9e9d56b9dcda8e498f82cf50e04fb94823
2019-12-26 16:13:58 +00:00
Jiyong Park
d3e86cfd66 Merge "unbreak sdk_phone_x86 boot"
am: 7c18a37147

Change-Id: I4cb0bdcbabbcbac9a7aa65b61cffffb8b8dc2173
2019-12-26 08:01:30 -08:00
Treehugger Robot
7c18a37147 Merge "unbreak sdk_phone_x86 boot" 2019-12-26 15:51:49 +00:00
android-build-team Robot
9ba3f7c655 Make change and version bump to QQ2A.191226.001
Change-Id: I5c0fefecea4fdcb360c74cc47dbd40eb763313e4
2019-12-26 02:20:43 +00:00
Automerger Merge Worker
4bce5b4f4b Merge "Define ro.product.vndk.version" am: e8139b905d am: a126b69335
Change-Id: If7676e80733b8a4a6b4e958a20f8e9d9e3fcf322
2019-12-25 09:15:53 +00:00
Justin Yun
a126b69335 Merge "Define ro.product.vndk.version"
am: e8139b905d

Change-Id: Id413c3c9749811583e843555d0904edfffecbf6d
2019-12-25 01:02:58 -08:00
Treehugger Robot
e8139b905d Merge "Define ro.product.vndk.version" 2019-12-25 08:28:50 +00:00
android-build-team Robot
ae93e0f3ab Make change and version bump to QQ2A.191225.001
Change-Id: Ia45ce4c4e57ad21e23e188e11106e5d16e6f3fbe
2019-12-25 02:20:36 +00:00
Justin Yun
04e5a40f2c Define ro.product.vndk.version
Use ro.product.vndk.version to show the VNDK version that the product
partition is using.
When PRODUCT_PRODUCT_VNDK_VERSION is set, add ro.product.vndk.version
in /product/build.prop.
If PRODUCT_PRODUCT_VNDK_VERSION is "current", ro.product.vndk.version
will have the VNDK version in PLATFORM_VNDK_VERSION. Otherwise, it
will have the value defined in PRODUCT_PRODUCT_VNDK_VERSION.

Bug: 144534640
Test: Check if /product/build.prop has "ro.product.vndk.version"
Change-Id: If5e7e3a6c155de45f88f68700f16175656896afe
2019-12-24 07:20:43 +00:00
P Adarsh Reddy
7e9b5c4204 Handle virtual A/B defines during dynamic_partitions_info merge.
While merging the Dynamic Partition info Dicts in the case of
split builds, pick the virtual-a/b flags like virtual_ab,
virtual_ab_retrofit from the vendor half.

Bug: 146811936
Test: Merged build contains the virtual a/b defines.
Change-Id: I0171b074094e47cfd12dc6af2565acdcd1b65163
2019-12-24 06:32:03 +00:00
android-build-team Robot
4882183afb Make change and version bump to QQ2A.191224.001
Change-Id: Iac9e56a3ea5743de2f5aaa5edb32497bc9dfe18a
2019-12-24 02:22:17 +00:00