Commit Graph

1443 Commits

Author SHA1 Message Date
Yo Chiang 9ce76bb1c4 Disable required modules check on darwin
Bug: 162102724
Test: `make sdk` on darwin
Change-Id: Ib89ef776475c5a20574f78188a2b5cad5fdd8f00
Merged-In: Ib89ef776475c5a20574f78188a2b5cad5fdd8f00
(cherry picked from commit 4d2ea47f06)
2020-08-11 23:54:04 +08:00
Dan Willemsen a3f6632de9 Remove obsolete PDK build functionality
This hasn't worked for a couple years, and continues to bitrot. Just
remove it.

Test: treehugger
Change-Id: Iea6caf3c08252a560155e095135c5ddaad712991
Merged-In: Iea6caf3c08252a560155e095135c5ddaad712991
2020-08-11 01:12:01 +00:00
Dan Willemsen fd72f7f3ac Reland "Move some prebuilt build tool configs to Soong"
Now that they're defined with prebuilt_build_tool, we don't need to set
them here.

In future changes we can replace more of these definitions with
prebuilt_build_tool, as it can centralize the selection of
build-from-source or prebuilt for Make, Soong, and user-defined
genrules.

Test: treehugger
Change-Id: I5821bbad1b655d561919245320d7c184a6eac737
2020-08-07 13:40:10 -07:00
Evgenii Stepanov 830eddbe27 Define ro.sanitize.<name> properties in SANITIZE_TARGET builds.
This will let us quickly check the system image build type,
and modify *.rc behavior based on that.

Bug: 142430632
Test: adb shell getprop ro.sanitize.hwaddress in hwasan build
Change-Id: Id1738ebc94a7c29ea9902a063f5d8dd6deb48f1b
2020-08-06 23:29:53 +00:00
Yo Chiang 64faf88940 Require required modules to exist
Error if a required module doesn't exist unless
ALLOW_MISSING_DEPENDENCIES or BUILD_BROKEN_MISSING_REQUIRED_MODULES
is true.

Bug: 7456955
Test: TH build_test
Change-Id: I5cdc56c7433b7ce15da155993b7100af9af604fa
Merged-In: I5cdc56c7433b7ce15da155993b7100af9af604fa
(cherry picked from commit c6159372b7)
2020-08-06 06:41:09 +00:00
Tianjie Xu 3443517fcb Merge "Add ro.product.ab_ota_partitions as a build prop" 2020-08-04 21:36:08 +00:00
Tianjie 9f581237e3 Add ro.product.ab_ota_partitions as a build prop
The prop list the name of the a/b partitions that are supposed to
update via an OTA. The list varies by product, and update engine
needs to know these partitions to install the GKI update correctly.

Test: build and check the property
Change-Id: I5258955a5c3303bdc61b97fc92f5dfa1905f7c37
2020-07-31 13:21:45 -07:00
Joel Galenson 154ac1d870 Update language to meet Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference.

Bug: 161896447
Test: Build
Change-Id: I8d33207c84f424e89f367b1c917661347402ae77
2020-07-30 15:05:55 -07:00
Kiyoung Kim c8343a3f0e Merge "Deprecate VNDK-Lite" 2020-07-28 00:36:10 +00:00
Dan Willemsen 0132fb7fae Merge "Revert "Move some prebuilt build tool configs to Soong"" 2020-07-23 21:43:04 +00:00
Dan Willemsen 51c49e590d Revert "Move some prebuilt build tool configs to Soong"
This reverts commit 3e1c9115d1.

Reason for revert: broke builds where makefiles were using M4 without depending upon it

Change-Id: Ib2deef08255656b91cb8ec42f1cb7e9555364f23
2020-07-23 21:38:00 +00:00
Dan Willemsen 925d63690c Merge "Move some prebuilt build tool configs to Soong" 2020-07-23 21:10:04 +00:00
satayev b7f74b89db Merge "Revert "Add a check for apex/allowed_deps.txt to droidcore."" 2020-07-23 15:20:18 +00:00
satayev c42d9bfc27 Revert "Add a check for apex/allowed_deps.txt to droidcore."
Revert "Track allowed transitive deps in any updatable module."

Revert submission 1312796-apex-allowed-deps

Reason for revert: b/161974327
Reverted Changes:
I52a4be72e:Add a check for apex/allowed_deps.txt to droidcore...
I56771ba3f:Track allowed transitive deps in any updatable mod...

Change-Id: I20ad7bf2001e76b5e3ca4aaf3baa5318e270f3dc
2020-07-23 15:15:54 +00:00
satayev 38b739a640 Merge "Add a check for apex/allowed_deps.txt to droidcore." 2020-07-23 12:41:11 +00:00
Artur Satayev 12e2d0f7a2 Add a check for apex/allowed_deps.txt to droidcore.
The check ensures that build graph for updatable modules contains only
allowed dependencies at build time.

Bug: 149622332
Test: m
Change-Id: I52a4be72efaa523d53827dd11822a7802543dd10
Merged-In: I5695dd1003386191dbbe0ea511ef5b615d0d5e4e
Exempt-From-Owner-Approval: cp
2020-07-23 12:40:49 +00:00
Yo Chiang 8bb1285f65 Merge "Auto-generate dexpreopt boot image module" 2020-07-21 03:37:23 +00:00
Kiyoung Kim 7ae3ce79aa Deprecate VNDK-Lite
Android S would not support upgrade from O-MR1 devices, so VNDK Lite
configuration is no more valid. This change removes all VNDK-Lite
related steps and makr BOARD_VNDK_RUNTIME_DISABLE as deprecated
variable.

Bug: 158719241
Test: m -j passed
Change-Id: Ifb355da936933843862426e7ddfce9c7f69cea61
Merged-In: Ifb355da936933843862426e7ddfce9c7f69cea61
2020-07-20 05:39:29 +00:00
Dan Willemsen 3e1c9115d1 Move some prebuilt build tool configs to Soong
Now that they're defined with prebuilt_build_tool, we don't need to set
them here.

In future changes we can replace more of these definitions with
prebuilt_build_tool, as it can centralize the selection of
build-from-source or prebuilt for Make, Soong, and user-defined
genrules.

Test: treehugger
Change-Id: I4bb526492ebc6270b6030913c1f5b3f49dc61284
2020-07-17 20:01:04 -07:00
Yifan Hong 76a337f65e Add odm_dlkm partition. am: f496f1b94f am: 4f2ea25d5f
Original change: https://android-review.googlesource.com/c/platform/build/+/1363859

Change-Id: I4aaa3967e889923f0958afaa3227474176e36ea9
2020-07-17 22:52:14 +00:00
Yifan Hong 4f2ea25d5f Add odm_dlkm partition. am: f496f1b94f
Original change: https://android-review.googlesource.com/c/platform/build/+/1363859

Change-Id: I8c7af808f72de5611cb52f34c0138bc97ceb6254
2020-07-17 22:27:15 +00:00
Yifan Hong 997d227648 Merge changes from topic "odm_dlkm"
* changes:
  Create $OUT/{vendor,odm}/lib before symlink modules
  Add odm_dlkm/etc/build.prop
  Install ODM dlkm to appropriate place and symlink
  Add notice files for odm_dlkm
  Add odm_dlkm partition.
2020-07-17 22:05:26 +00:00
Treehugger Robot 902286139d Merge "Adding vbmeta_system.img and vbmeta_vendor.img to droidcore" am: 9aa278a124 am: f80a0ad1a9
Original change: https://android-review.googlesource.com/c/platform/build/+/1364522

Change-Id: I47de417538cda11749dcf07e85c259a4f32104b3
2020-07-17 10:41:15 +00:00
Bowgo Tsai 9b56140cb1 Adding vbmeta_system.img and vbmeta_vendor.img to droidcore
In the concept of system/vendor build split, usually vbmeta.img
won't be built in a system-only build and/or a vendor-only build.
Instead, vbmeta.img will be generated later when combining system
and vendor artifacts.

  - system-only artifacts: system.img, system_ext.img,
                           product.img and vbmeta_system.img
  - vendor-only artifacts: boot.img, vendor.img, odm.img and
                           vbmeta_vendor.img

PRODUCT_BUILD_VBMETA_IMAGE can be used to disable building vbmeta.img.
However, it also disables vbmeta_system.img and vbmeta_vendor.img
generation because both are only depended by vbmeta.img.

This change adds both vbmeta_[system|vendor].img into droidcore,
so they will be built even if PRODUCT_BUILD_VBMETA_IMAGE is set
to false, when we're building system-only artifacts or vendor-only
artifacts.

Bug: 161425613
Test: sets PRODUCT_BUILD_VBMETA_IMAGE := false then build, checks
      vbmeta_system.img is generated but vbmeta.img is not.
Change-Id: I39d9819da4704195b0e1ee58d13c848ae97d474a
2020-07-17 09:41:40 +00:00
Colin Cross 81e22595d4 Merge "Dist lint reports for apps" am: d56abedb02 am: ec7b0b85d9
Original change: https://android-review.googlesource.com/c/platform/build/+/1360938

Change-Id: I687efe1b63e316306dce9d3235470cb322e3ed20
2020-07-16 23:19:43 +00:00
Colin Cross d56abedb02 Merge "Dist lint reports for apps" 2020-07-16 23:06:22 +00:00
Yifan Hong f496f1b94f Add odm_dlkm partition.
Test: define odm_dlkm in CF.
Bug: 156020364
Change-Id: I5593d09a1cdf13e651a13e951336555a7475865e
2020-07-16 12:34:29 -07:00
Yo Chiang 204ba62996 Merge "Refine dump-files" am: 7c16b443c3 am: 3241e51595
Original change: https://android-review.googlesource.com/c/platform/build/+/1362417

Change-Id: If626546e8708a809b985e13b6721b61eb48468ea
2020-07-15 07:56:57 +00:00
Yo Chiang 7c16b443c3 Merge "Refine dump-files" 2020-07-15 07:24:41 +00:00
Yifan Hong 9fce02b625 Add vendor_dlkm partition. am: cfb917a1c7 am: 58af66905e
Original change: https://android-review.googlesource.com/c/platform/build/+/1316438

Change-Id: I84a4ffc60242ba92ade09dba87ba53a15394fe9f
2020-07-14 19:47:16 +00:00
Yo Chiang 561efbc1fb Refine dump-files
Dump $(modules_to_install) instead of $(product_target_FILES) to get a
more complete list of target files.

Use `echo $(modules_to_install) | tr -s ' ' '\n'` instead of
`$(foreach m,$(modules_to_install),$(info $(m)))`.
This way only one `echo` command is emitted instead of emitting `echo`
command for each file. This speeds up the invocation speed tremendously.

Bug: 159195410
Test: m dump-files
Change-Id: I06549cecc64177f1eb5a01e31a55d5eed307fcfd
2020-07-14 18:30:34 +08:00
Yo Chiang 3ca4980d36 Auto-generate dexpreopt boot image module
Add prebuilt modules that installs bootjar dexpreopt files generated by
soong, for example `dexpreopt_bootjar.boot_arm64` installs .art / .oat /
.vdex, etc for the framework boot image ("boot") for primary arch
("arm64").

Bug: 159196136
Test: TH built artifacts noop
Test: Check device boot images are installed
Test: ./prebuilts/build-tools/linux-x86/bin/ninja -f out/combined-aosp_arm64.ninja -t browse
Test: Check that generated dependency graph is sane
Test: Check that bootjar dexpreopt bits are listed in `m dump-files`
Change-Id: Ia30b37be9be972c5e28b5840923801ea7237a237
2020-07-14 15:49:08 +08:00
Yifan Hong cfb917a1c7 Add vendor_dlkm partition.
Test: define vendor_dlkm for CF.
Bug: 156020364

Change-Id: I459059e1c20df7a285a377b8b3bbc8decc60b124
2020-07-13 14:20:56 -07:00
Roland Levillain 5b64b25892 Merge "Turn `COVERAGE_PATHS` and `COVERAGE_EXCLUDE_PATHS` into obsolete variables." am: 18a4837e07 am: eac977277e
Original change: https://android-review.googlesource.com/c/platform/build/+/1356640

Change-Id: I495754cce3a252e33ad893cbc733fade18484daf
2020-07-13 15:28:30 +00:00
Roland Levillain 7b309fc538 Merge "Revert^2 "Turn uses of `COVERAGE_PATHS` and `COVERAGE_EXCLUDE_PATHS` into errors."" am: ce637304a0 am: e9ea935a96
Original change: https://android-review.googlesource.com/c/platform/build/+/1360377

Change-Id: I63f1e49c66e7112e03a229a9ed47a48b894ae887
2020-07-11 15:06:09 +00:00
Colin Cross b842952421 Dist lint reports for apps
Dist the transitive lint report for each unbundled app built by Soong
when lint-check is on the command line.

Bug: 153485543
Test: m TARGET_BUILD_APPS=Gallery2 lint-check dist
Change-Id: Icd2b6f884396fa5f743746099301c325ca82a324
2020-07-10 16:41:10 -07:00
Roland Levillain be3c3719d4 Revert^2 "Turn uses of `COVERAGE_PATHS` and `COVERAGE_EXCLUDE_PATHS` into errors."
All known uses of environment variables `COVERAGE_PATHS` and
`COVERAGE_EXCLUDE_PATHS` (in AOSP and downstream branches) have
been replaced with `NATIVE_COVERAGE_PATHS` and
`NATIVE_COVERAGE_EXCLUDE_PATHS` (resp.).

This reverts commit 62d9912677.

Reason for revert: The cause of the build breakages caused by the
initial change has been addressed.

Test: m nothing
Test: Check that `m nothing COVERAGE_PATHS=art` fails.
Test: Check that `m nothing COVERAGE_EXCLUDE_PATHS=art` fails.
Test: Check the Android Build for build errors related to these variables.
Bug: 158212027
Bug: 160769227
Change-Id: Ic267e1b61e84bc6f016a3eb57efe7f9b859adb42
2020-07-10 11:00:32 +00:00
Orion Hodson 053157150c Merge "Revert "Turn uses of `COVERAGE_PATHS` and `COVERAGE_EXCLUDE_PATHS` into errors."" am: be88cd9140 am: cc990adddc
Original change: https://android-review.googlesource.com/c/platform/build/+/1358402

Change-Id: I531c6a60d9b33c61d493e83a5f30201ba5bde292
2020-07-08 14:28:51 +00:00
Lais Andrade 62d9912677 Revert "Turn uses of `COVERAGE_PATHS` and `COVERAGE_EXCLUDE_PATHS` into errors."
This reverts commit ace5860719.

Reason for revert: Droidcop-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_rvc-dev-plus-aosp&target=build_test3&lkgb=6662220&lkbb=6662382&fkbb=6662228
Bug: 158212027
Bug: 160769227
Test: N/A revert
Change-Id: I0d366adcc735e9cc417d28013afb0386dea1fa64
2020-07-08 13:58:23 +00:00
Roland Levillain cd80a6afea Turn `COVERAGE_PATHS` and `COVERAGE_EXCLUDE_PATHS` into obsolete variables.
(cherry picked from commit c276bf4f3cc72e479d21c7bd0b34673d93e76f9a)

Test: m nothing
Bug: 158212027
Change-Id: Ibc0dbfd21465ab6fc5b826a52bf605910af283e7
Merged-In: Ibc0dbfd21465ab6fc5b826a52bf605910af283e7
2020-07-08 12:56:29 +01:00
Roland Levillain 0186ba0e25 Merge "Turn uses of `COVERAGE_PATHS` and `COVERAGE_EXCLUDE_PATHS` into errors." am: 01ce4a0b02 am: e38c36fec0
Original change: https://android-review.googlesource.com/c/platform/build/+/1356639

Change-Id: I1c68053b54fbe25ab0e6fd70a172c29430662d62
2020-07-08 10:40:59 +00:00
Roland Levillain ace5860719 Turn uses of `COVERAGE_PATHS` and `COVERAGE_EXCLUDE_PATHS` into errors.
All known uses of environment variables `COVERAGE_PATHS` and
`COVERAGE_EXCLUDE_PATHS` have been replaced with
`NATIVE_COVERAGE_PATHS` and `NATIVE_COVERAGE_EXCLUDE_PATHS` (resp.).

Test: m nothing
Test: Check that `m nothing COVERAGE_PATHS=art` fails.
Test: Check that `m nothing COVERAGE_EXCLUDE_PATHS=art` fails.
Test: Check the Android Build for build errors related to these variables.
Bug: 158212027
Change-Id: Icc7c1d9734e78c2bf327f00f04355700b5476648
2020-07-07 15:01:26 +01:00
Treehugger Robot ac584e3c10 Merge "add build.prop for other partitions to the dist out" am: 3f2e4cc4e6 am: 0712846afa
Original change: https://android-review.googlesource.com/c/platform/build/+/1354463

Change-Id: I3197158fe8b789e6a4bb5372196a45f850d5e3a4
2020-07-06 23:57:47 +00:00
Treehugger Robot 3f2e4cc4e6 Merge "add build.prop for other partitions to the dist out" 2020-07-06 23:24:49 +00:00
Treehugger Robot e7123b456b Merge "target-host-required: Be permissive when ALLOW_MISSING_DEPENDENCY is set" am: 19950004b5 am: 1b97119e6b
Original change: https://android-review.googlesource.com/c/platform/build/+/1354465

Change-Id: I650bd8e620eb8908fa8851ad1efddb18a7eacf29
2020-07-06 10:30:22 +00:00
Yo Chiang d23ac0e477 target-host-required: Be permissive when ALLOW_MISSING_DEPENDENCY is set
add-all-host-to-target-required-modules-deps and
add-all-target-to-host-required-modules-deps permit errors when
ALLOW_MISSING_DEPENDENCY is set to true.

The previous behavior may break when doing unbundled builds.

Bug: 160318430
Bug: 7456955
Test: TH art-target-arm build pass
Change-Id: I00818d27ce18f4072eff9fa98958be820b5cd1f8
Merged-In: I00818d27ce18f4072eff9fa98958be820b5cd1f8
(cherry picked from commit 2c7c8bb657)
2020-07-06 10:57:51 +08:00
Jiyong Park 0ee7115b2d add build.prop for other partitions to the dist out
Previously, only system/build.prop was registered as dist out. This
change adds build.prop in the other partitions to the dist out. This
will allow us to examine those build.prop files without downloading
the entire target-files.zip file.

Bug: 117892318
Test: examine the dist out
Change-Id: I6f4ba16d765336a57f0da90edba788a627f25e60
2020-07-03 09:59:10 +09:00
Yo Chiang b01380fc0c Merge "Resolve module bitness for target-host required modules" am: c9b0f0a9a5 am: 156fa7335a
Original change: https://android-review.googlesource.com/c/platform/build/+/1344818

Change-Id: Ide74364062c611fae31dbf269be61f1428f2c411
2020-06-30 11:44:03 +00:00
Yo Chiang c9b0f0a9a5 Merge "Resolve module bitness for target-host required modules" 2020-06-30 11:21:03 +00:00
Colin Cross 0bd0e1bb69 Merge "Use inclusive language in build/make part 2" am: e1ab4cb610 am: 09ee73f2a7
Original change: https://android-review.googlesource.com/c/platform/build/+/1344806

Change-Id: Ic71f7ecd3dbc384957dc671013eb7772ab7311d2
2020-06-24 22:24:54 +00:00
Colin Cross e1ab4cb610 Merge "Use inclusive language in build/make part 2" 2020-06-24 21:58:46 +00:00
Colin Cross d1cbfeaa3a Use inclusive language in build/make part 2
Test: m checkbuild
Bug: 158889297
Change-Id: I63bac680cc63a8564f35ae85dda1a0b09c9fd541
2020-06-24 12:03:08 -07:00
Roland Levillain 02a69dade0 Merge "Warn about the use of `COVERAGE_PATHS` and `COVERAGE_EXCLUDE_PATHS`." am: 4a203a6326 am: 053e972a22
Original change: https://android-review.googlesource.com/c/platform/build/+/1328973

Change-Id: Ia66d95b0f81d6f8cb75d2dbc9dc36a5806dea5e1
2020-06-24 10:57:31 +00:00
Roland Levillain 4a203a6326 Merge "Warn about the use of `COVERAGE_PATHS` and `COVERAGE_EXCLUDE_PATHS`." 2020-06-24 10:16:03 +00:00
Yo Chiang 697674fa56 Resolve module bitness for target-host required modules
Add select-bitness-of-target-host-required-modules that resolves module
bitness for TARGET_REQUIRED_FROM_HOST and HOST_REQUIRED_FROM_TARGET.
Also re-indent select-bitness-of-required-modules.

Bug: 7456955
Test: TH
Test: compare value of ALL_MODULES.<*>.*_REQUIRED_FROM_*
Change-Id: I9483685d8dd528cb1a4ef1e2ec53cbe2caa598a4
2020-06-22 07:07:10 +00:00
Sophie Zheng 4ed1925587 Merge "NDK api code coverage" am: 34fe2651ed am: 5a8764a6a7
Original change: https://android-review.googlesource.com/c/platform/build/+/1342181

Change-Id: I3206b6a5915bdf9ea46b80b523428876f9e8662b
2020-06-18 20:00:24 +00:00
sophiez cb00590712 NDK api code coverage
Update parsed NDK api xml file directory name.

Test: m ndk
Forrest test build pass: http://shortn/_E5mhRtD4zW

Change-Id: Ic20780d969e33103c45953c9cdd81efe4262b4a9
2020-06-17 23:01:21 +00:00
Sophie Zheng fbfb207232 Merge "Revert "Revert "Copy generated xml file for NDK api coverage to dist when CLANG_COVERAGE flag set.""" am: b5bfbab22b am: a38bfeab4e
Original change: https://android-review.googlesource.com/c/platform/build/+/1336765

Change-Id: I23f88fcd3b1f8e5f13b01a9ca37629c96308e623
2020-06-17 17:42:54 +00:00
Sophie Zheng b5bfbab22b Merge "Revert "Revert "Copy generated xml file for NDK api coverage to dist when CLANG_COVERAGE flag set.""" 2020-06-17 17:11:32 +00:00
Roland Levillain bececf9e92 Warn about the use of `COVERAGE_PATHS` and `COVERAGE_EXCLUDE_PATHS`.
The use of environment variables `COVERAGE_PATHS` and
`COVERAGE_EXCLUDE_PATHS` has been deprecated since they have been
replaced by `NATIVE_COVERAGE_PATHS` and
`NATIVE_COVERAGE_EXCLUDE_PATHS` (resp.).

Test: m nothing
Bug: 158212027
Change-Id: I1c48dc4da15c630201168cce34edb920960c93d4
2020-06-16 11:27:34 +01:00
Sophie Zheng 970d5925bd Revert "Revert "Copy generated xml file for NDK api coverage to dist when CLANG_COVERAGE flag set.""
This reverts commit dd9467aa23.

Reason for revert: Fix to the breakage merged in https://android-review.googlesource.com/c/platform/build/soong/+/1332082.

Forest test build pass: http://shortn/_AWiWymhTjF

Change-Id: Ie47b84c51e85c8d372c5ee49963d671ff08ef91a
2020-06-15 20:42:37 +00:00
Jiyong Park cd0c931b89 Merge "Organize product vars for adding properties" 2020-06-15 10:00:22 +00:00
Colin Cross 8fae3c8472 resolve merge conflicts of 4cbab13de1 to rvc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I12bbaf25876357f564829044b672f042240b2acf
2020-06-12 17:46:50 -07:00
Treehugger Robot 2158d2ec6b Merge "Use inclusive language in build/make" 2020-06-12 03:19:02 +00:00
madym ae1e6d2275 Merge "Revert "Copy generated xml file for NDK api coverage to dist when CLANG_COVERAGE flag set."" am: cca4dffa6f am: 35e9165b0c
Original change: https://android-review.googlesource.com/c/platform/build/+/1331942

Change-Id: Ibbb280710c5de22e225273bca8bda1eb53117fd7
2020-06-11 22:50:39 +00:00
madym cca4dffa6f Merge "Revert "Copy generated xml file for NDK api coverage to dist when CLANG_COVERAGE flag set."" 2020-06-11 22:25:05 +00:00
madym dd9467aa23 Revert "Copy generated xml file for NDK api coverage to dist when CLANG_COVERAGE flag set."
This reverts commit a81ee59b74.

Reason for revert: maybe broke the build b/158783867

Change-Id: Ia7a81109de3adb4b5226b4139f3e231e60473283
2020-06-11 22:05:42 +00:00
Colin Cross c3ad80467e Use inclusive language in build/make
Test: m checkbuild
Change-Id: I54a7e55d3fdd5571ef1ae33ebe443c10d138fd28
2020-06-11 14:37:54 -07:00
Colin Cross f2d4c5784b Merge "Add out/soong/late-${TARGET_PRODUCT}.mk" am: bc1051d399 am: 0cb47d0534
Original change: https://android-review.googlesource.com/c/platform/build/+/1325119

Change-Id: I403c456cc8e24f5795513f31aecf6a96927c93eb
2020-06-11 20:47:03 +00:00
Sophie Zheng 7162ca2ff4 Merge "Copy generated xml file for NDK api coverage to dist when CLANG_COVERAGE flag set." am: 537aee38d5 am: 110b79a2e3
Original change: https://android-review.googlesource.com/c/platform/build/+/1321934

Change-Id: I40447b16666ed216478087a5c50bacf8b25ccd7a
2020-06-11 18:59:46 +00:00
Colin Cross bc1051d399 Merge "Add out/soong/late-${TARGET_PRODUCT}.mk" 2020-06-11 18:36:18 +00:00
Sophie Zheng 537aee38d5 Merge "Copy generated xml file for NDK api coverage to dist when CLANG_COVERAGE flag set." 2020-06-11 18:21:53 +00:00
Martin Stjernholm b3fc54e824 Introduce TARGET_BUILD_UNBUNDLED. am: 7a430fd4c8 am: 6c1aae726f
Original change: https://android-review.googlesource.com/c/platform/build/+/1324512

Change-Id: I8777dd8241790686f32dd03319f88c0c7815da71
2020-06-11 10:43:13 +00:00
Jiyong Park eb49b34b1e Organize product vars for adding properties
Properties for <partition>/build.prop are now added via
PRODUCT_<PARTITION>_PROPERTIES.

PRODUCT_SYSTEM_PROPERTIES is added. PRODUCT_SYSTEM_DEFAULT_PROPERTIES
will be deprecated.

PRODUCT_VENDOR_PROPERTIES is added. PRODUCT_PROPERTY_OVERRIDES and
PRODUCT_DEFAULT_PROPERTY_OVERRIDES will be deprecated in favor of the new
variable.

For other partitions (odm, system_ext, product), there is no change.

Exempt-From-Owner-Approval: cherry-pick from internal master

Bug: 117892318
Test: m
Merged-In: I98f3b5d0da661b3ad75260a23754e655103b7a44
(cherry picked from commit ad810b6dae)
Change-Id: I98f3b5d0da661b3ad75260a23754e655103b7a44
2020-06-11 15:35:23 +09:00
Jiyong Park 1ea01c5b24 Organize product vars for adding properties
Properties for <partition>/build.prop are now added via
PRODUCT_<PARTITION>_PROPERTIES.

PRODUCT_SYSTEM_PROPERTIES is added. PRODUCT_SYSTEM_DEFAULT_PROPERTIES
will be deprecated.

PRODUCT_VENDOR_PROPERTIES is added. PRODUCT_PROPERTY_OVERRIDES and
PRODUCT_DEFAULT_PROPERTY_OVERRIDES will be deprecated in favor of the new
variable.

For other partitions (odm, system_ext, product), there is no change.

Exempt-From-Owner-Approval: cherry-pick from master

Bug: 117892318
Test: m
Merged-In: I98f3b5d0da661b3ad75260a23754e655103b7a44
(cherry picked from commit ad810b6dae)
Change-Id: I98f3b5d0da661b3ad75260a23754e655103b7a44
2020-06-11 15:13:41 +09:00
Martin Stjernholm 7a430fd4c8 Introduce TARGET_BUILD_UNBUNDLED.
Setting this flag enables unbundled building, i.e. without support for
building the system image and other platform targets. This
functionality was previously enabled by TARGET_BUILD_APPS, and setting
that still implies TARGET_BUILD_UNBUNDLED.

This helps unbundled builds that aren't apps, e.g. ART runtest builds.
Specifically, with the topic of the child CL
https://r.android.com/1324517 TARGET_BUILD_UNBUNDLED does not imply
disabling dexpreopting, unlike TARGET_BUILD_APPS.

TODO: There may still be app-specific conditions that are incorrectly
controlled by TARGET_BUILD_UNBUNDLED, in particular on the Soong side
through config.UnbundledBuild().

Test: Flash & boot
Test: TH, in particular builds green on ub-launcher3-master
Bug: 157549171
Change-Id: Ic09fc879117ee06cab5444edfc280ed2b52d2870
2020-06-11 01:09:07 +01:00
Yo Chiang d84cd89894 Merge "Cleanup unused get-32-bit-modules" am: 988693fb00 am: 6875feaf06
Original change: https://android-review.googlesource.com/c/platform/build/+/1307156

Change-Id: I898fb6454fef8fddac8b467c9ccc14a2dfb25611
2020-06-10 02:53:34 +00:00
Yo Chiang 1e55e74acc Cleanup unused get-32-bit-modules
These are no longer used by anyone:
* get-32-bit-modules
* get-32-bit-modules-if-we-can
* get-host-32-bit-modules
* get-host-32-bit-modules-if-we-can

Bug: 155869107
Test: TH
Change-Id: I441de7f94061efd40186b80d1a2ead11669a5753
2020-06-09 03:28:26 +00:00
Jiyong Park fe7df0a0a7 <partition>/build.prop rules are defined using macro am: e28fa80e12 am: 236859d234
Original change: https://android-review.googlesource.com/c/platform/build/+/1317596

Change-Id: I4f05b3376ab6621787dd540f53ad851dff6194a3
2020-06-08 16:21:17 +00:00
Jiyong Park 236859d234 <partition>/build.prop rules are defined using macro am: e28fa80e12
Original change: https://android-review.googlesource.com/c/platform/build/+/1317596

Change-Id: I6e5bd7a93c6e7fe0e45ca5befb2f110bfb40c4e1
2020-06-08 16:04:52 +00:00
Colin Cross 8ca4092ab4 Add out/soong/late-${TARGET_PRODUCT}.mk
Read out/soong/late-${TARGET_PRODUCT}.mk after reading Android.mk files
to allow Soong's makevars singleton to use $(call dist-for-goals).

Test: m lint-check dist
Change-Id: I7754fd1b8dab508c96ad59beed67f0d6c4ff75f0
2020-06-07 18:16:38 -07:00
Jiyong Park c844de4241 Merge changes I4d88733c,I61943476,Ibed9c96d
* changes:
  remove buildinfo_common.sh
  Partial cherry-pick of ag/10260813
  <partition>/build.prop rules are defined using macro
2020-06-08 00:58:48 +00:00
Yo Chiang 15183fa4fc Merge changes I47d523e4,Ib2f4b548 am: f9d1eee9b9 am: ee709b28ed
Original change: https://android-review.googlesource.com/c/platform/build/+/1323335

Change-Id: I911d66ee6dc8c0b127b419ce7dc44f871155fd25
2020-06-05 05:44:35 +00:00
Yo Chiang f9d1eee9b9 Merge changes I47d523e4,Ib2f4b548
* changes:
  Make required modules support :32 and :64 suffix
  Refactor *-select-bitness-of-required-modules
2020-06-05 05:12:23 +00:00
Jiyong Park e28fa80e12 <partition>/build.prop rules are defined using macro
The macro `build-properties' is defined to generate build rules to
create <partition>/build.prop.

build.prop files in all partitions except for the system partition are
now build using the macro.

system partition will use the macro in the following changes.

Bug: 117892318
Test: m

Change-Id: Ibed9c96dac4366251ec59a0b1317aa92f501c9a3
2020-06-05 10:47:34 +09:00
Treehugger Robot 49efd2aad0 Merge "Re-enable link type checking" 2020-06-03 21:30:22 +00:00
Dan Willemsen be15ded040 Re-enable link type checking
When I removed the actions that ran the python link type checker, I
forgot that the Make version hadn't been enabled yet. Enable the Make
version.

Bug: 143748700
Test: treehugger (particularly, build_test on the downstream branches)
Change-Id: I293b3be5ca7828c9d7148e13d88b0f0bba54d964
Merged-In: I293b3be5ca7828c9d7148e13d88b0f0bba54d964
Merged-In: I08090db44d47f809fbaa0c4ad373e46e6a3fbe2e
2020-06-03 21:09:32 +00:00
Yo Chiang 60da88da55 Make required modules support :32 and :64 suffix
Support specifying bitness of required modules with :32 and :64 suffix,
like in PRODUCT_PACKAGES.

Bug: 155869107
Bug: 129323707
Test: TH noop
Change-Id: I47d523e4e57cb8a99629fd241a16069c0be55903
2020-06-03 18:27:42 +08:00
Yo Chiang 1b8283358e Refactor *-select-bitness-of-required-modules
* Streamline required module bitness resolution

If a module is for cross host OS, the required modules are also for that
OS.
Otherwise if the requirer module is native and the required module is
shared library or native test, then the required module resolves to the
same bitness.
Otherwise the required module resolves to both variants, if they exist.

* Factor out the common logic and merge
  <target|host|host-cross>-select-bitness-of-required-modules

This lays the road for follow-up changes to add bitness suffix support.
This slightly reduces readibility. To make up for the loss, the
bitness-resolving logic is easier to maintain since we don't have
multiple copies of *-select-bitness-of-required-modules.

Bug: 155869107
Test: check the diff of product_target_FILES and product_host_FILES
Test: check the diff of ALL_MODULES.*.REQUIRED_FROM_(TARGET|HOST)
Change-Id: Ib2f4b548535e983d621dad71cb920101111140f2
2020-06-03 18:27:20 +08:00
sophiez a81ee59b74 Copy generated xml file for NDK api coverage to dist when CLANG_COVERAGE flag set.
Test: build/soong/soong_ui.bash --make-mode SKIP_ABI_CHECKS=true TARGET_PRODUCT=aosp_cf_x86_phone TARGET_BUILD_VARIANT=userdebug droid dist DIST_DIR=/usr/local/google/home/sophiez/my_dist_dir EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true CLANG_COVERAGE=true SKIP_BOOT_JARS_CHECK=true tests

Change-Id: I778da9ca7897752274744eca5530412c146fac96
2020-06-01 12:18:54 -07:00
Jiyong Park c96b261f59 Merge changes from topics "remove_bootimage_sysprops", "sysprop" am: 6dd5383c37 am: 04799633dd
Change-Id: Iddb4cfd419dc0f68e15cb62f2545d8bc178b42ca
2020-05-29 21:52:11 +00:00
Jiyong Park 6dd5383c37 Merge changes from topics "remove_bootimage_sysprops", "sysprop"
* changes:
  Drop the dependency from vendor/build.prop to system/build.prop
  Remove ro.bootimage.* sysprops
  ro.build.expect.* sysprops are created in a separate rule
  Make use of ADDITIONAL_ODM_PROPERTIES
  Refactor post_process_props.py
  remove code for default.prop
  Make more use of ADDITIONAL_VENDOR_PROPERTIES
  ADDITIONAL_*_PROPERTIES are props determined by the build system
2020-05-29 01:01:52 +00:00
Yo Chiang baca76e5f8 Merge "Check module existence with ALL_MODULES subvars" am: 0dcb96c204 am: 06d3445271
Change-Id: I8d10724a2afba3bc33a58957b63a48f75a72d683
2020-05-28 10:49:20 +00:00
Jiyong Park ca9b02c1ce Make use of ADDITIONAL_ODM_PROPERTIES
Properties that were defined in the build rule for odm/build.prop are
now defined via ADDITIONAL_ODM_PROPERTIES.

Bug: 117892318
Test: m
Change-Id: I6220e217d0724b6e27127786e7a908e1e662d1a0
2020-05-27 12:52:44 +09:00
Jiyong Park f2b944ccea Make more use of ADDITIONAL_VENDOR_PROPERTIES
Properties that were defined in the build rule for vendor/build.prop are
now defined via ADDITIONAL_VENDOR_PROPERTIES.

Bug: 117892318
Test: m
Change-Id: Ib3dc9d001a8dcd0aa38f1acae384a96b67b5af8a
2020-05-27 12:52:43 +09:00
Jiyong Park 57f51f1693 ADDITIONAL_*_PROPERTIES are props determined by the build system
This change defines ADDITIONAL_<partition>_PROPERTIES to store properties
determined by the build system itself.

ADDITIONAL_SYSTEM_PROPERTIES was originally ADDITIONAL_BUILD_PROPERTIES.
ADDITIONAL_VENDOR_PROPERTIES was originally FINAL_VENDOR_DEFAULT_PROPERTIES.
ADDITIONAL_PRODUCT_PROPERTIES has been there and thus not changed.
ADDITIONAL_ODM_PROPERTIES is newly defined, although it is empty now.

In addition, ADDITIONAL_VENDOR_PROPERTIES are now defined in
core/main.mk along with other ADDITIONAL_*_PROPERTIES.

Bug: 117892318
Test: m

Change-Id: Ic41bba2e5695355436ac8df353866cfc044e1e0b
2020-05-27 12:52:43 +09:00
Yo Chiang 1db657a1ed Check module existence with ALL_MODULES subvars
Use ALL_MODULES.*.PATH to check module existence.
Use get-modules-for-2nd-arch to check the existence of second arch
variant.
Fix some typos *existant -> existent

Bug: 155869107
Test: lunch mainline_system_arm64; m
Test: lunch generic; m
Change-Id: Ic10fb34a11da0bfbfc528da7496fd929b1d77113
2020-05-20 16:02:07 +00:00
Yo Chiang 7644587bcc Merge "Resolve module bitness for PRODUCT_PACKAGES" am: 7c147f7e29 am: b5e015fa9e
Change-Id: If01ecd77e857d826f085cdcab18dd1c4c7506ff2
2020-05-20 05:38:34 +00:00
Yo Chiang 7c147f7e29 Merge "Resolve module bitness for PRODUCT_PACKAGES" 2020-05-20 04:55:22 +00:00
Treehugger Robot 26a01be6bc Merge changes I80341c2e,I0935f611,Ia805cb47 am: 3dbbfde296 am: 68e66200f2
Change-Id: I0bd92a44d7507ef2f695a342878a37859b69fc82
2020-05-20 04:20:18 +00:00
Treehugger Robot 3dbbfde296 Merge changes I80341c2e,I0935f611,Ia805cb47
* changes:
  Deprecate ADDITIONAL_DEFAULT_PROPERTIES
  Move most of the sysprop generation rules to sysprop.mk
  Add PLATFORM_VERSION_LAST_STABLE
2020-05-20 03:49:26 +00:00
Yo Chiang 06d81cc30a Merge "Refactor bitness resolving logic of product-installed-files" am: 502606f8ce am: 395e91dba5
Change-Id: Ia2b98f97cf06b7c0854e9f0aebd8c6389297b84e
2020-05-19 03:46:15 +00:00
Jiyong Park 80f164c0b3 Deprecate ADDITIONAL_DEFAULT_PROPERTIES
As we merge default.prop into build.prop, we don't need to distinguish
ADDITIONAL_DEFAULT_PROPERTIES and ADDITIONAL_BUILD_PROPERTIES. Deprecate
the former in favor of the latter.

Bug: 117892318
Test: m
Change-Id: I80341c2e05d70821396202dc9e94104625ebf024
2020-05-18 21:44:52 +09:00
Yo Chiang 5e85bfe3a3 Resolve module bitness for PRODUCT_PACKAGES
PRODUCT_PACKAGES contains "simple module name" and "bitness suffix".
Call `resolve-bitness-for-modules` to resolve module bitness before
using PRODUCT_PACKAGES.

Bug: 155869107
Test: TH presubmit build_test
Test: check the value of event_log_tags_src
Change-Id: I95fcd833990b3401892c2f7859c83acd90f9e920
2020-05-14 04:07:56 +00:00
Yo Chiang b85a140c3c Refactor bitness resolving logic of product-installed-files
* Add get-modules-for-2nd-arch helper function

Add a generic function to retrieve second arch variant module names for
TARGET, HOST and HOST_CROSS modules.
It uses ALL_MODULES.<module>.FOR_2ND_ARCH to make sure that we are
really returning second arch variant module names.
Unlike `get-32-bit-modules` this function doesn't sort its output so it
potentially saves us a tiny bit of makefile parsing time.

* Add resolve-bitness-for-modules

Factor out the common bitness-resolving logic of
`product-installed-files` and `host-installed-files` to a helper
function.
When resolving HOST_CROSS modules, the primary arch is 32-bit and
secondary arch is 64-bit.

Bug: 155869107
Test: TH
Test: check the value of product_target_FILES and product_host_FILES
Change-Id: I0fdea2e8c55e5b8edf960dbf5e17bb789abb0bf8
2020-05-13 20:42:07 +08:00
Treehugger Robot b50843c57f Merge changes I17671ca2,I4e6d9d93,Ia43cbbd0 am: 8bd7c4f3cc am: ccb927b9c4
Change-Id: Iffdd112cdabe367b74c9855d77e0760574e49eef
2020-04-29 02:13:58 +00:00
Dan Willemsen 17315c2eda Remove empty rules for check_elf_files.timestamp
If we don't have any new dependencies, or we never set up the
check_elf_files.timestamp rule, don't create an empty one now.

There were >7000 of these unused and empty rules in my AOSP
aosp_cf_x86_phone build.

This was initially brought to my attention by the new checks in
https://github.com/google/kati/pull/189

Test: diff out/build-aosp_cf_x86_phone.ninja, only removed phony rules
Change-Id: Ia43cbbd04df4a01d2182b14e3ccbe5d5ecbcabad
2020-04-28 14:56:06 -07:00
Treehugger Robot 9147c6ca1f Merge "Restore $(SOONG_OUT_DIR)/ndk/% in static_whitelist_patterns" am: 7b66a61d9b am: 627e62e1a6
Change-Id: Ifc750410707f35ccf4822b42ec0e3ab3b3111d9b
2020-04-27 11:11:33 +00:00
Jeongik Cha 82fead38a4 Restore $(SOONG_OUT_DIR)/ndk/% in static_whitelist_patterns
$(SOONG_OUT_DIR)/ndk/% needs to be whistlisted in release branch
(ag/11251273)
Accordingly, restore it in aosp as well.

Bug: 148993225
Test: m nothing
Change-Id: I7503c007c3e786b0cab26ea1422f0d4ba5a40662
2020-04-27 04:44:58 +00:00
Treehugger Robot 4d5a3d8655 Merge "Clean up static_whitelist_patterns" am: 691d385147 am: 75ff753569
Change-Id: If011c50e830855fb7b71bbf7729d7c429beb8137
2020-04-24 12:25:21 +00:00
Treehugger Robot 691d385147 Merge "Clean up static_whitelist_patterns" 2020-04-24 12:03:21 +00:00
Treehugger Robot 737bcbd04b Merge "Extend static_whitelist_patterns" am: 4aa437f3ab am: 43e1e38bd1
Change-Id: Ia150a51a515d6b04407d3714a8961a81f848968f
2020-04-24 08:39:59 +00:00
Treehugger Robot 4aa437f3ab Merge "Extend static_whitelist_patterns" 2020-04-24 08:02:33 +00:00
Jeongik Cha ab50b8fa85 Extend static_whitelist_patterns
product-installed-files generates more default artifacts than
$(call module-installed-files,$(call auto-included-modules)),
and it causes problems when we try to apply this mechanism to other
partition

So use product-installed-files with an empty parameter as static
whitelist

Test: apply require-artifacts-in-path to other partition(or path),
      and then, m nothing
Test: add system module outside mainline_system.mk, and check if there is error.

Bug: 148993225
Change-Id: Ie110f20ff833229b23a777ff1decb32f84b9cef7
2020-04-24 05:08:02 +00:00
Jeongik Cha 4472819166 Clean up static_whitelist_patterns
$(HOST_OUT)/% and $(SOONG_OUT_DIR)/ndk/% are not necessary anymore.

Bug: b/148993225
Test: m nothing
Change-Id: If2551283ebb6c516c029d1c04aebe25661bc6a1a
2020-04-24 14:05:49 +09:00
Dan Willemsen f08587c925 Remove AUX support am: 58634e1482 am: c4fb07d615
Change-Id: Ic54cef973b4573886a562690fe0d3c8b35816f4a
2020-04-21 23:11:48 +00:00
Dan Willemsen 58634e1482 Remove AUX support
This was deprecated in R, which has now branched, and there aren't any
users on master.

Test: build-aosp_crosshatch.ninja is the same (except for the removal of the empty auxiliary target)
Test: treehugger
Change-Id: I306156ab7f91cd4a2258554b4215766c99cd12d1
2020-04-18 21:00:18 -07:00
Dan Shi 00490906ad Merge "Include shared host liraries in test suite zip" am: 3c4326f32f am: 34ca4231d5
Change-Id: Ifeb0f611ca81ac13016f3372f4c0c435b2c5884c
2020-04-14 23:56:36 +00:00
Dan Shi 6a619b8d85 Include shared host liraries in test suite zip
Bug: 151194160
Test: m -j vts && \
  ls out/host/linux-x86/vts/android-vts/testcases/lib64/
Change-Id: I7ebc4bf392d4c0f27478607846974631390097f8
2020-04-13 09:29:16 -07:00
Anton Hansson 41623558b1 Merge "Add api xml files for new api surfaces" into rvc-dev am: 3d22657e15
Change-Id: Ica6859d777d1e4d3e1e599a797af4aafc7544c2e
2020-04-02 11:30:52 +00:00
Anton Hansson 7dbf7dcb7b Add api xml files for new api surfaces
The coverage infra ingests these xml files to track
api coverage of APIs. Create files equivalent to the
existing files for the new API surfaces defined in R.

Bug: 152949797
Test: m dist && du -hs out/dist/*.xml
Change-Id: Id1914c34d1e9527964251b328179d20613a2d712
2020-04-01 14:36:28 +01:00
Orion Hodson 70fcf897c5 Update dex2oat filter
verify-at-runtime is deprecated in favor of extract. Update to
stop deprecation warnings during OTAs.

Exempt-From-Owner-Approval: cherry-pick from rvc-dev

Bug: 149794809
Test: manual OTA
Change-Id: I9b8365a1fba5fd18420661a3e6ada77f3609bcc7
Merged-In: I9b8365a1fba5fd18420661a3e6ada77f3609bcc7
(cherry picked from commit db651d5913)
2020-03-30 13:03:47 +00:00
Orion Hodson 864dc9c1af Merge "Update dex2oat filter" into rvc-dev am: cc464a4cdb
Change-Id: I2b770dc13ccff7711247d9f90a25522647c9915d
2020-03-26 20:03:46 +00:00
Orion Hodson db651d5913 Update dex2oat filter
verify-at-runtime is deprecated in favor of extract. Update to
stop deprecation warnings during OTAs.

Bug: 149794809
Test: manual OTA
Change-Id: I9b8365a1fba5fd18420661a3e6ada77f3609bcc7
2020-03-26 15:04:29 +00:00
Yifan Hong 18f3e2d04b Merge "Build DEVICE manifests and fragments for each SKU" into rvc-dev 2020-03-11 18:44:36 +00:00
Automerger Merge Worker 9d28e91481 Merge "Build DEVICE manifests and fragments for each SKU" am: 136764d714 am: 35c1a627f6
Change-Id: I6d7847ad342625dc6962764ad38b97cadc1efc92
2020-03-10 21:22:42 +00:00
Roopesh Nataraja 202d4c8db4 Build DEVICE manifests and fragments for each SKU
Single vendor can support multiple skus with different
capabilities. Add support to define and build sku
based device manifests.

Specify DEVICE manifests in BoardConfig.mk as below.

  # installed to /vendor/etc/vintf/manifest_{sku}.xml
  DEVICE_MANIFEST_SKUS := sku1 sku2 sku3

  DEVICE_MANIFEST_SKU1_FILE := device/foo/bar/manifest_sku1.xml
  DEVICE_MANIFEST_SKU2_FILE := device/foo/bar/manifest_sku2.xml
  DEVICE_MANIFEST_SKU3_FILE := device/foo/bar/manifest_sku3.xml

Bug: 148601741

Change-Id: Id57d4ad21b0d3edf8d60d07446b6b806c1df20ab
Merged-In: Id57d4ad21b0d3edf8d60d07446b6b806c1df20ab
2020-03-10 12:22:31 -07:00
Roopesh Nataraja 11e776fc32 Build DEVICE manifests and fragments for each SKU
Single vendor can support multiple skus with different
capabilities. Add support to define and build sku
based device manifests.

Specify DEVICE manifests in BoardConfig.mk as below.

  # installed to /vendor/etc/vintf/manifest_{sku}.xml
  DEVICE_MANIFEST_SKUS := sku1 sku2 sku3

  DEVICE_MANIFEST_SKU1_FILE := device/foo/bar/manifest_sku1.xml
  DEVICE_MANIFEST_SKU2_FILE := device/foo/bar/manifest_sku2.xml
  DEVICE_MANIFEST_SKU3_FILE := device/foo/bar/manifest_sku3.xml

Bug: 148601741

Change-Id: Id57d4ad21b0d3edf8d60d07446b6b806c1df20ab
2020-03-09 15:09:08 -07:00
Automerger Merge Worker 759ce2b3b8 Merge "Don't touch .installable_files for non-FULL_BUILD" am: 573f458718 am: 718193f9b2
Change-Id: I8e106a0ee581eaec783ec79230fb7e94770f45bd
2020-03-06 00:36:53 +00:00
Bill Peckham 011255996c Don't touch .installable_files for non-FULL_BUILD
If we're not doing a full build, leave
$(PRODUCT_OUT)/.installable_files* alone rather
than truncating it. This prevents the clean logic
in Soong from removing everthing that we're trying
to use to build an image using the snod, vnod, etc.
goals.

Bug: 149460609
Test: make droid, make vnod, verify vendor.img
Change-Id: I612e32621b8045d085829507f22f6385b859f0c2
Merged-In: I612e32621b8045d085829507f22f6385b859f0c2
2020-03-05 11:20:33 -08:00
Bill Peckham 573f458718 Merge "Don't touch .installable_files for non-FULL_BUILD" 2020-03-05 18:49:48 +00:00
Bill Peckham 7c3aa02ca3 Don't touch .installable_files for non-FULL_BUILD
If we're not doing a full build, leave
$(PRODUCT_OUT)/.installable_files* alone rather
than truncating it. This prevents the clean logic
in Soong from removing everthing that we're trying
to use to build an image using the snod, vnod, etc.
goals.

Bug: 149460609
Test: make droid, make vnod, verify vendor.img
Change-Id: I612e32621b8045d085829507f22f6385b859f0c2
2020-03-04 15:12:52 -08:00
Automerger Merge Worker f5504ac259 Merge "Move build number file to out/soong" am: 47b08fbab5 am: 87f76601de
Change-Id: I268b7f7d214b140adef9cddd7161815ed9e54cea
2020-02-28 20:44:46 +00:00
Automerger Merge Worker 87f76601de Merge "Move build number file to out/soong" am: 47b08fbab5
Change-Id: I8561be9fcabc54526fbf5efa48ef32b08f025b96
2020-02-28 20:32:26 +00:00
Colin Cross d68a88402f Move build number file to out/soong
Move the build number file to out/soong so Soong can treat it
as an output path, and pass the name of the file to Soong instead
of the command to read it.

Test: m checkbuild
Change-Id: I9e1aecf33d11fe4fde34cd57cc9b1f1ad49b0424
2020-02-25 00:06:46 +00:00
Automerger Merge Worker dfa3d23969 Merge "Adding vendor_boot-debug.img" am: 31d4a5aed7 am: e1570cb99d am: a20bb6522a
Change-Id: Ic5ec4776d4daa91a1423b65d96e34026756ae9ad
2020-02-20 04:44:58 +00:00
Automerger Merge Worker e1570cb99d Merge "Adding vendor_boot-debug.img" am: 31d4a5aed7
Change-Id: I48f3ded6c5c63aa9a828a529880f0cdb2918f8e2
2020-02-20 04:12:10 +00:00
Bowgo Tsai 6a68367e6e Adding vendor_boot-debug.img
Commit I30137c3caef91805d9143d404e5e4d06c0fccc30 adds boot-debug.img
to allow adb root with an user build GSI image.

  https://source.android.com/compatibility/vts/vts-on-gsi

Another commit I5b005097b73f59857c3a2f92d693b3e67ee8424e adds
vendor_boot.img to pair with a generic kernel image, the GKI boot.img.

To allow adb root for devices using a GKI, vendor_boot-debug.img is
introduced. The image combination used in VTS will be:

    Old devices without GKI:
      GSI system.img + boot-debug.img + vendor.img, etc.

    New devices with GKI:
      GSI system.img + GKI boot.img + vendor_boot-debug.img + vendor.img, etc.

Note that boot-debug.img still can be used on new devices for
non-compliance scenario.

Bug: 147849477
Test: lunch aosp_cf_x86_64_phone-userdebug; make vendorbootimage_debug
Test: `make dist`, checks that both vendor_boot-debug.img and
      vendor-ramdisk-debug.cpio.gz are in $OUT/ and out/dist.
Test: `make dist`, checks that installed-files-vendor-ramdisk-debug.{json,txt} are
       in $OUT/ and out/dist.
Change-Id: I66b662d8b1e5c619ed7bb81e40233fe9df363b27
2020-02-18 13:46:17 +08:00
Automerger Merge Worker 2f7d750a4e Merge "Remove unused no_vendor_variant_vndk_check target" am: 526551f013 am: 64d0b72f81 am: ad916eda39
Change-Id: Icbe22459d1cf5cbf45eae7d2e4561e5a55b52faa
2020-01-29 07:31:15 +00:00
Vic Yang 64d0b72f81 Merge "Remove unused no_vendor_variant_vndk_check target"
am: 526551f013

Change-Id: Id13c047df6da98ce0ab23b625c1578c2db2d3571
2020-01-28 23:04:41 -08:00
Vic Yang 3ec918d342 Remove unused no_vendor_variant_vndk_check target
This was missed when we moved from a single target for checking all
VNDK libraries to using timestamp files for checking individual VNDK
libraries.

Test: Build success.
Change-Id: I3be19f6755b24fff2446449a9dbc84db9a20ea41
2020-01-28 21:01:38 -08:00
Automerger Merge Worker 49f0e0283c Merge "Fix building docs as part of checkbuild" am: 35e12a7020 am: a8008259f9 am: 0550ae99a4
Change-Id: I1844b23cc9e31c8ea4f5d521cb621e824afc3c53
2020-01-28 23:07:48 +00:00
Colin Cross a8008259f9 Merge "Fix building docs as part of checkbuild"
am: 35e12a7020

Change-Id: I6d3e445979e8d390841d24c01cbf37f8d6a20445
2020-01-28 14:46:48 -08:00
Colin Cross 43e74295e0 Fix building docs as part of checkbuild
s/module_to_check/modules_to_check/

Bug: 118815658
Test: m checkbuild
Change-Id: I53e10747ed404509fd11adb72e641c702e27655b
2020-01-27 11:36:07 -08:00
TreeHugger Robot 2f0743483b Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master" into stage-aosp-master 2020-01-16 18:29:25 +00:00
Automerger Merge Worker 1df6d79a0b Merge "device_(manifest|matrix).xml -> vendor_*" am: 2e4f20f540 am: fe1bb53543 am: 9a33bc10bc
Change-Id: I355ece2b39df76de7b82ba65805ea7cf561b7f75
2020-01-16 04:32:31 +00:00
Automerger Merge Worker 9a33bc10bc Merge "device_(manifest|matrix).xml -> vendor_*" am: 2e4f20f540 am: fe1bb53543
Change-Id: I07c65054fe5a569b557b10fb885c0efe735841a3
2020-01-16 04:23:03 +00:00
Yifan Hong 51be69f063 device_(manifest|matrix).xml -> vendor_*
Building device_manifest.xml or device_compatibility_matrix.xml only
builds vendor manifest / matrices, but not all device manifest /
matrices (e.g. vintf_fragments, ODM manifest, etc.). Make the name more
accurate.

Test: m check-vintf-all

Change-Id: Ib017507c421355263d53a9e5b357f169c77da36d
2020-01-14 14:24:51 -08:00
Automerger Merge Worker bf4f7acb17 Merge "jacoco-report-classes-all.jar includes jar from other partitions" am: 3801c82e33 am: bf9e4cdd81 am: cccefb9901
Change-Id: I3b3f60fd7f81972c99198859b04fba76c6b336b8
2020-01-09 01:17:28 +00:00
Automerger Merge Worker cccefb9901 Merge "jacoco-report-classes-all.jar includes jar from other partitions" am: 3801c82e33 am: bf9e4cdd81
Change-Id: I6adf59d2188289165034d7374fe50ad1f32dda54
2020-01-09 01:05:03 +00:00