Commit graph

58630 commits

Author SHA1 Message Date
Steven Moreland
f371b1886f Merge changes from topics "vintf-rebootescrow", "vintf-vibrator"
* changes:
  vibrator: use package as name
  rebootescrow: use package as name
2020-01-07 02:19:06 +00:00
Steven Moreland
a31e24a799 vibrator: use package as name
In order to provide a more descriptive name, and to be consistent
with HIDL, the stable AIDL package names are switching from
vintf-vibrator format to the package format
(android.hardware.vibrator).

Bug: N/A
Test: all build time
Change-Id: I382074d66b06669876d8f9fa4fc95b8a9c4dbf2a
2020-01-06 13:41:47 -08:00
Steven Moreland
458c3511a0 rebootescrow: use package as name
In order to provide a more descriptive name, and to be consistent
with HIDL, the stable AIDL package names are switching from
vintf-rebootescrow format to the package format
(android.hardware.rebootescrow).

Bug: N/A
Test: all build time
Change-Id: I6468651c86ee38939073dab0418b3633762a5a80
2020-01-06 13:22:06 -08:00
TreeHugger Robot
9011ec1627 Merge "Revert "Add libdepthphoto to mainline_system"" 2020-01-06 21:05:43 +00:00
TreeHugger Robot
6fc140d6c5 Merge "Update VNDK library list for occupant awareness." 2020-01-06 20:19:32 +00:00
Automerger Merge Worker
a61a137493 Merge "Add unpack_bootimg to otatools to modify boot.img" am: eb28123fef am: e91b131bf6 am: 2521dfcc51
Change-Id: I57d0c128de581e0b1e8c9a859d68f67ab531bd69
2020-01-06 19:38:36 +00:00
Automerger Merge Worker
2521dfcc51 Merge "Add unpack_bootimg to otatools to modify boot.img" am: eb28123fef am: e91b131bf6
Change-Id: I81b03757db624f00d3262bcf90f15da6f104e1bb
2020-01-06 19:09:22 +00:00
Daniel Mentz
e91b131bf6 Merge "Add unpack_bootimg to otatools to modify boot.img"
am: eb28123fef

Change-Id: Id475852d32699e3e263be46614a99962d42f773e
2020-01-06 10:53:03 -08:00
Daniel Mentz
eb28123fef Merge "Add unpack_bootimg to otatools to modify boot.img" 2020-01-06 18:43:56 +00:00
Daniel Mentz
30652b3380 Add unpack_bootimg to otatools to modify boot.img
unpack_bootimg in conjunction with mkbootimg can be used to re-create
boot.img with a different kernel image and ramdisk.

Change-Id: I9615facc9335885989772a0dd7f08217e2143a45
2020-01-04 15:25:42 -08:00
Automerger Merge Worker
2c3d9c0171 Merge "Export list of "installable" files to soong_ui" am: 99202ec0a6 am: 8e080ccefe am: 3bbef8f744
Change-Id: I9c92904edc1da963a4711d523d565bfe3434229a
2020-01-04 05:46:02 +00:00
Automerger Merge Worker
3bbef8f744 Merge "Export list of "installable" files to soong_ui" am: 99202ec0a6 am: 8e080ccefe
Change-Id: I0dd6e68b91057d93f41c47da80749c7dbcb80aea
2020-01-04 05:34:11 +00:00
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
Automerger Merge Worker
49ace7d958 Merge "Add BUILD_BROKEN_NINJA_USES_ENV_VARS" am: f29df793c9 am: a9bfb4faba am: d57b01a563
Change-Id: Ib613fddf1c24cecf9daea37967b7c429875ac26a
2020-01-04 02:35:11 +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
fc41d36191 Merge "Add Soong android_app and android_test modules to javac-check" am: 6e54952b44 am: 253f31621e am: de4fd03ad9
Change-Id: Id4095e0d7dc27e0f01a8a1285d686bc17f8a5678
2020-01-03 19:56:43 +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
882a93434e [automerger skipped] Merge "DO NOT MERGE - Merge QQ1A.200105.003 into stage-aosp-master" into stage-aosp-master am: e074e6a01e -s ours am: 61e7c87b5c -s ours
am skip reason: subject contains skip directive

Change-Id: I2c422aa75e69e9a8cafe24002bfd26ab80a166c4
2020-01-03 18:20:40 +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
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
d1d54804fd Merge "Handle virtual A/B defines during dynamic_partitions_info merge." am: 9d4a90ef4b am: d5e0c4761f am: ae53351e8c
Change-Id: Ic13fbd7c6b25e02519e9c80f9bcf3648a00ce4da
2020-01-02 22:11:00 +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
Emilian Peev
23abbfeb4b Revert "Add libdepthphoto to mainline_system"
This reverts commit 55b9c1b651.

Reason for revert: "libdepthphoto" is no longer required or built
Bug: 132449311
Test: Successful build

Change-Id: Id2013f80dbc962f70ccb1b687c0dc18fef372348
2020-01-02 12:54:30 -08:00
TreeHugger Robot
1abdc0a391 Merge "Re-enable link type checking" 2020-01-02 18:04:20 +00:00
Automerger Merge Worker
d479001a05 Merge "Add Multidisplay App and so to whitelist" into qt-qpr1-dev am: dd82625f27 am: f037120754
Change-Id: Idbbe6b1bb2c2a4fa80a701dfe5f9772ff1284b4a
2019-12-31 18:20:41 +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
Chen Xu
0d9f3cb2fb Merge "Revert submission 1182953-1576003954286-8455af5a" 2019-12-27 18:56:38 +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
8ac23e29a5 Merge "Stop removing valid copy headers" am: 4506b17dd3 am: 04b25efc91 am: 4e3a78ff3b
Change-Id: If41beb9184182eb0fed3f83bc4cca11ca9636f00
2019-12-27 02:53:01 +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
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
a8eab50647 Merge "Do not build ld.config.txt" am: f1ef5591f1 am: 63e1d4d899 am: 1785dcfe52
Change-Id: Ie53f50ad3ae9d4d00c7bbb0d86a459b5e8d9db60
2019-12-27 00:37:17 +00: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
9ae31126ea 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
2019-12-26 15:19:11 -08:00
Automerger Merge Worker
72e79a2fe3 Merge "unbreak sdk_phone_x86 boot" am: 7c18a37147 am: d3e86cfd66 am: 541c3e98cf
Change-Id: I1bdd00e0f2bd0748668ecc7969c3a960ad0aa9d1
2019-12-26 16:30:09 +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