Commit Graph

57407 Commits

Author SHA1 Message Date
Automerger Merge Worker a93eac7c3f Merge "Revert "Add boringssl_self_test to PRODUCT_PACKAGES"" am: ee83e2d2c8 am: 44e7c20968
Change-Id: I607fded6b55a3470fa705be224ffb19ef35d2380
2020-01-07 04:19:39 +00:00
Jiyong Park 44e7c20968 Merge "Revert "Add boringssl_self_test to PRODUCT_PACKAGES""
am: ee83e2d2c8

Change-Id: Ieea03a9be3a725208eb1a282885c165a770190ca
2020-01-06 20:04:20 -08:00
Treehugger Robot ee83e2d2c8 Merge "Revert "Add boringssl_self_test to PRODUCT_PACKAGES"" 2020-01-07 03:51:29 +00:00
Automerger Merge Worker 4c5e852883 Merge "update-vndk-list.sh delinated with ticks in error" am: 0fe0eda502 am: 81e3cfa8a3
Change-Id: I0b00593d9a43f21093cb41fe02af536b3c7ec17b
2020-01-07 02:07:59 +00:00
Steven Moreland 81e3cfa8a3 Merge "update-vndk-list.sh delinated with ticks in error"
am: 0fe0eda502

Change-Id: Ibc9784555bfb489911b56b0124928dd27dc94711
2020-01-06 17:52:38 -08:00
Treehugger Robot 0fe0eda502 Merge "update-vndk-list.sh delinated with ticks in error" 2020-01-07 01:47:42 +00:00
Steven Moreland 7e2ec0e5af update-vndk-list.sh delinated with ticks in error
People have asked me on several occassions how to fix this error. It's
somewhat confusing since scripts aren't usually on a path. However, in
this case, the script is added to the path on host. Hopefully, using
tick marks here will make that more clear.

Bug: N/A
Test: N/A
Change-Id: I8601a5a9eb348b2e358875b45eae57ec910c9a06
2020-01-06 15:05:07 -08: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 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 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
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
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
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
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
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
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
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
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
Automerger Merge Worker 3648df452f Merge "Only dist recovery_ramdisk if BOARD_USES_RECOVERY_AS_BOOT" am: 9de27595ec am: de2634bdf0
Change-Id: I9a2d2b6be6992423ae1f8b2117af616dd5b74cce
2019-12-24 00:14:27 +00:00
Daniel Mentz de2634bdf0 Merge "Only dist recovery_ramdisk if BOARD_USES_RECOVERY_AS_BOOT"
am: 9de27595ec

Change-Id: Ifa10228e31c1fa3f7fa234dfa043a01c216f6ab0
2019-12-23 16:01:00 -08:00
Treehugger Robot 9de27595ec Merge "Only dist recovery_ramdisk if BOARD_USES_RECOVERY_AS_BOOT" 2019-12-23 23:32:38 +00:00
Automerger Merge Worker a582ec70ae Merge "Add /system/vendor/odm for VINTF search path" am: dafae5228c am: b15c78ea17
Change-Id: I038ad38a701709a4fd42f4e111412dca33d34ff5
2019-12-23 23:15:47 +00:00