Commit Graph

23304 Commits

Author SHA1 Message Date
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
Inseob Kim ce83956fa9 Fix broken my_image_variant
It should happen after adjusting vendor and product variables.

Bug: 162476652
Test: see image variant with LOCAL_PROPRIETARY_MODULE := true
Change-Id: I071434916c9ad18572c559a26e3ef6abb8c47303
2020-08-10 13:04:23 +09:00
Jeongik Cha 66853bb381 Merge changes from topic "b/160390776"
* changes:
  Unset ENABLE_PREOPT when DISABLE_PREOPT is set
  Introduce TARGET_BUILD_UNBUNDLED_IMAGE
2020-08-10 00:51:56 +00:00
Colin Cross c4e9bf20ce Merge changes I4c84d194,I696b424e
* changes:
  Combine HOST/TARGET in Test Suite NOTICE.
  Build NOTICE txt file into TestSuite zip package.
2020-08-08 03:29:01 +00:00
Evgenii Stepanov 48e914e991 Merge "Define ro.sanitize.<name> properties in SANITIZE_TARGET builds." 2020-08-07 22:44:18 +00:00
Treehugger Robot 7c556f30be Merge "Add BOARD_KERNEL_MODULE_INTERFACE_VERSIONS." 2020-08-07 18:37:36 +00: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
Treehugger Robot 5610430667 Merge "Don't use the remote pool when using clang-tidy" 2020-08-06 19:27:17 +00:00
wangzhou 23acb0b896 Combine HOST/TARGET in Test Suite NOTICE.
This improved NOTICE bundling now includes TARGET_OUT deps that Android
Test Suites packages need, especially those for .apk files.

Bug: b/141258651
Test: $ make cts && \
        unzip -p out/host/linux-x86/cts/android-cts.zip \
        android-cts/NOTICE.txt \
        | less -N
Change-Id: I4c84d194ff5982fc57b6a8097602d4a9df68d61c
Merged-In: I4c84d194ff5982fc57b6a8097602d4a9df68d61c
(cherry picked from commit e73186d2ac)
2020-08-06 12:07:40 -07:00
wangzhou e7f1725938 Build NOTICE txt file into TestSuite zip package.
- the NOTICE file is only taken from out/host.
- currently only enabled from cts by setting flag "test_suite_notice"

Test: $ make cts && unzip -l \
        out/host/linux-x86/cts/android-cts.zip \
        | grep NOTICE
      $ make pts && \ unzip -l \
        out/host/linux-x86/cts/android-cts.zip \
        | grep NOTICE
Bug: b/141258651
Change-Id: I696b424e5f2b09d28d53ccbd9198e1f4f301ec01
Merged-In: I696b424e5f2b09d28d53ccbd9198e1f4f301ec01
(cherry picked from commit 93d2fbbcad)
2020-08-06 12:07:40 -07:00
Dan Willemsen ceba3cb656 Don't use the remote pool when using clang-tidy
In Make, clang-tidy and clang run in the same action, but only clang can
be remoted via RBE/GOMA. So to prevent running up to 500 clang-tidy
instances at the same time and overloading the machine, use the local
pool when using clang-tidy. This does limit the parallelism of the clang
actions attached to clang-tidy, but hopefully that's not that much of a
problem. Clang-tidy isn't enabled by default (opt-in per-build /
per-module), and Soong does not run into this problem.

Bug: 162615762
Test: m WITH_TIDY=1 nothing; build-aosp_flame.ninja is identical before/after
Test: use_rbe m WITH_TIDY=1; inspect build-aosp_flame.ninja, see local_pool
Change-Id: I7dd196fcf4183d175b9608d3d48cdcdf81b514ce
Merged-In: I7dd196fcf4183d175b9608d3d48cdcdf81b514ce
2020-08-06 18:44:25 +00:00
Yifan Hong bdf548bdc0 Merge "Add BOARD_KERNEL_BINARIES to board_config.mk" 2020-08-06 01:44:40 +00:00
Treehugger Robot 66b322cf6c Merge "Separate lists of soong sanitize modules" 2020-08-06 00:48:16 +00:00
Yifan Hong 3c1041fb22 Add BOARD_KERNEL_MODULE_INTERFACE_VERSIONS.
This is a list of KMI versions used to filter gki_apex modules. Only
gki_apex modules with kmi_version field that are in the list are created.

Test: build GKI APEXes
Bug: 162888350
Change-Id: I0f582f6ea200d52482fd4065c8f4f8b32efc4dee
2020-08-05 15:45:23 -07:00
Yifan Hong 6040cad5c1 Add BOARD_KERNEL_BINARIES to board_config.mk
Test: pass
Change-Id: Ic670a1c60d6ab2beca593da5941f56d4f3b76c3c
2020-08-05 15:45:23 -07:00
Xin Li 6ad6d563c0 Merge "Merge QQ3A.200805.001" 2020-08-05 21:05:34 +00:00
Xin Li 622e8fb529 Merge QQ3A.200805.001
Bug: 162879794
Merged-In: I5f0b271fb5302e8c72024b49fb1a2ae5120821e0
Change-Id: I47416909bc0c43e8c2fbf14087153802a1aa3b29
2020-08-05 17:38:39 +00:00
Tianjie Xu 3443517fcb Merge "Add ro.product.ab_ota_partitions as a build prop" 2020-08-04 21:36:08 +00:00
Inseob Kim 8b0ccdafbb Separate lists of soong sanitize modules
Dependencies of makefile modules are being redirected according to
SOONG_CFI_STATIC_LIBRARIES and SOONG_HWASAN_STATIC_LIBRARIES. But the
variables are shared among all variants (e.g. core, vendor, product,
arch), which can cause build error.

This splits the Makefile variables into several lists, one list per each
arch and each image variant, to correctly make the redirection.

Bug: 162476652
Test: build and inspect ninja
Change-Id: I8a46804d4b7c1c485e59e10710cc514a89333fa4
2020-08-04 17:18:01 +09:00
Jaegeuk Kim d9d2dff22d Merge "support make_f2fs with casefolding" 2020-08-04 04:18:07 +00:00
Jeongik Cha f26015449f Unset ENABLE_PREOPT when DISABLE_PREOPT is set
Instead of TARGET_BUILD_APPS, introduce DISABLE_PREOPT,
which is true when TARGET_BUILD_UNBUNDLED_IMAGE or TARGET_BUILD_APPS is set.

Test: TARGET_BUILD_UNBUNDLED_IMAGE=true m vendorimage and then
      check if there is no preopt
Bug: 160390776

Change-Id: Id27030e602a29ebd438678270db13744dd145143
2020-08-04 10:39:57 +09:00
Jeongik Cha d05b57a362 Introduce TARGET_BUILD_UNBUNDLED_IMAGE
- TARGET_BUILD_UNBUNDLED_IMAGE is similar to TARGET_BUILD_APPS, but
its targets are the unbundled partitions instead of apps.
- Rename TARGET_BUILD_APPS_USE_PREBUILT_SDK to TARGET_BUILD_USE_PREBUILT_SDKS
because it is used even without TARGET_BUILD_APPS.
-Instead of TARGET_BUILD_APPS, use TARGET_BUILD_USE_PREBUILT_SDKS
to build java modules with prebuilt sdks, and propagate to Soong.

Bug: 160390776
Test: TARGET_BUILD_UNBUNDLED_IMAGE=true m vendorimage
Change-Id: Ie096212ccbcca0018baae55e106af693b002c9e5
2020-08-03 15:47:09 +09:00
Treehugger Robot bf0c1b7b77 Merge "Update language to comply with inclusive guidance" 2020-07-31 22:50:49 +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
Yifan Hong 1ba1092e0a Merge "Add BOARD_KERNEL_BINARIES." 2020-07-31 19:13:38 +00:00
Treehugger Robot c21f30ca8a Merge "Update language to meet Android's inclusive language guidance" 2020-07-31 14:49:05 +00:00
Treehugger Robot 96abdc1b3a Merge "[config_sanitizers] Support LOCAL_SANITIZE_BLOCKLIST" 2020-07-31 00:22:15 +00:00
Pirama Arumuga Nainar 565583382d [config_sanitizers] Support LOCAL_SANITIZE_BLOCKLIST
It'll replace LOCAL_SANITIZE_BLACKLIST.

Update language to comply with Android’s inclusive language guidance

See https://source.android.com/setup/contribute/respectful-code for
reference

Bug: 161896447
Bug: 162245450

Test: n/a  (no users in AOSP for this property).
Change-Id: Ie31c35af722d05011a528e1170b0c026b50fbf88
2020-07-30 15:31:22 -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
Kevin Lau Fang c45b82c23b Update binary.mk language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 162241205
2020-07-29 22:16:49 +00:00
Yifan Hong e4aca26aef Add BOARD_KERNEL_BINARIES.
Test: use it
Bug: 161563386
Change-Id: Id07dffe7d8ef5122c7cf337b29fecba128fc7640
2020-07-29 14:51:00 -07:00
Liz Kammer 9dd20038b2 Update language to comply with inclusive guidance
Update android_app_set make files to use INSTALL rather than MASTER for
android_app_sets, this better matches the wording used for apex_set.

See https://source.android.com/setup/contribute/respectful-code for
reference

Bug: 161896447
Test: m nothing
Change-Id: I7f37a72914f4b18a839942cc3db98b1c57db921e
2020-07-28 15:59:38 -07:00
Joseph Murphy ba35404e2d Fixes a few things with the robolectric autoconfig
There are a few extra flags and a few changes to flags that have
happened over the course of getting Robolectric to run under Tradefed
that need adding to the autogenerated config.

Bug: b/157635117
Test: manual
Change-Id: Ifdf90bb512a6e92ed39e671aeff65e0ddf2d0c4f
2020-07-28 07:00:06 +00:00
Kiyoung Kim c8343a3f0e Merge "Deprecate VNDK-Lite" 2020-07-28 00:36:10 +00:00
Bill Peckham 48ae71a6f0 Export TARGET_ENABLE_MEDIADRM_64 to Soong.
The change enables conversion of
hardware/interfaces/drm/1.0/default from make to Soong
by exporting a variable used in a conditional check by
the modules in that directory.

Bug: 161571531
Bug: 123557988
Test: Build with TARGET_ENABLE_MEDIADRM_64 :=
Test: Build with TARGET_ENABLE_MEDIADRM_64 := true
Test: Insepction of out/soong/soong.variables for each
Test: Inspection of target files package for each
Test: Verify inclusion of modules in vendor snapshot
Change-Id: I5737d9d4687e182595a213be000b2e56c7536b8a
2020-07-23 20:57:22 +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
Bob Badour 2f3b200397 Merge "Add support for combining the notices from 2 roots." 2020-07-21 16:56:12 +00:00
Yo Chiang 8bb1285f65 Merge "Auto-generate dexpreopt boot image module" 2020-07-21 03:37:23 +00:00
Jaegeuk Kim 8ba4bab89f support make_f2fs with casefolding
Bug: 159672232
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: I4ac22a989010c747502d97e76faabf6cfdd9bf04
2020-07-20 17:52:41 -07:00
Colin Cross a903a5ec19 Merge "Provide a robolectric isolated test template" 2020-07-20 18:27:17 +00:00
Bob Badour 5e9e1fbe83 Add support for combining the notices from 2 roots.
Apparently needed for cts tests due to apks putting intermediate files under
TARGET_OUT even when going to HOST_OUT.

Test: m with and without change verified no differences in notice files

Change-Id: Iea50b6bd9af9452a2600c97e2f7cb89218b9be7f
2020-07-20 17:32:14 +00:00
Christopher Parsons 86eabf86e2 Merge "Add optional relative path to LOCAL_TEST_DATA processing" 2020-07-20 15:46:38 +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
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
Chris Parsons 1abe7ef455 Add optional relative path to LOCAL_TEST_DATA processing
Test: Verified in conjunction with changes to soong (aosp/1359742)
Test: Treehugger to verify backwards compatibility
Change-Id: I39d2669ff74b4387606b6416e8afefc1f6507348
2020-07-17 17:09:21 -04:00
Treehugger Robot 9aa278a124 Merge "Adding vbmeta_system.img and vbmeta_vendor.img to droidcore" 2020-07-17 10:07:05 +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