Commit graph

57987 commits

Author SHA1 Message Date
Jaewoong Jung
b5aa16d44f Fix test suite data files issue.
The current test suite rule implementation has a bug where test data
files are excluded from the final suite zip files when a suite doesn't
have a designated testcases output directory, which is represented by
COMPATIBILITY_TESTCASES_OUT_$(suite_name).

Specifically, the rule that collects test data files for each suite
filters out suite output paths that conflict with module output paths,
which happens when a suite doesn't have its own testcases output
directory. It seems to have been done this way just to avoid make rule
conflict errors, but it ended up causing missing test data files.

This change fixes it by adding an indexing purpose only test suit file
variable.

Fixes: 140761783
Test: m general-tests
Test: Compared before vs after, no meaningful differences.
Test: Changed bc-tests to a device test and built general-tests.
Test: Before - data files missing, after - data files present
Change-Id: I2008992f4144c6ee115f4b4e4ac9caa4312bbe34
2020-03-19 06:47:35 -07:00
Yifan Hong
352e6a4d18 Merge changes from topic "vendor_sku"
* changes:
  Proper checks for vendor and ODM SKUs
  Rename DEVICE_MANIFEST_<sku>_FILE to FILES
2020-03-16 22:04:56 +00:00
Treehugger Robot
474c9c6eba Merge "Add ANGLE.apk to the base system." 2020-03-16 18:39:26 +00:00
Geoff Lang
6ee4bed4ad Add ANGLE.apk to the base system.
ANGLE has been packaged as a prebuilt library in internal master.  This
CL transitions the library to being built from source in AOSP so it can
be tested and included as a mainline module.

Test: ANGLE is in the developer options/EGL platform can load ANGLE
Bug: 142239747

Change-Id: Ie06dcfccce022ed608c18362e246f6f2a3c6fb1a
2020-03-16 16:57:42 +00:00
Yifan Hong
28ffd73591 Proper checks for vendor and ODM SKUs
If DEVICE_MANIFEST_FILE / ODM_MANIFEST_FILES is set, also include check
for empty vendor / odm SKU, respectively. Then, do cross product of
vendor SKUs and ODM skus, and check each possible combination.

Test: build with and without vendor skus
Test: m check-vintf-all
Bug: 148601741

Change-Id: I23cc81998e7afc36c43540bf6d615b4d4b288447
2020-03-13 18:32:07 -07:00
Yifan Hong
07ea2c0360 Rename DEVICE_MANIFEST_<sku>_FILE to FILES
Use plural since multiple files can be defined and assembled together.

Test: pass
Bug: 148601741
Change-Id: I82a7aeb68ea26702e63757a41f32840b6186ab88
2020-03-13 18:32:07 -07:00
Tianjie Xu
059d22231c Merge "ota_tool: fix incremental ota error" 2020-03-13 19:43:17 +00:00
Xindong Xu
2a7aaa69ae ota_tool: fix incremental ota error
Problem:
Logical partitions do not update right since commit
f67dd8059d

    Generate block based OTA for product partitions

due to the wrong order of parameters. This is logged in
/tmp/recovery.log:

    skipping 0 blocks already patched to 202

Bug: 149794632
Change-Id: I92f7a8a226a8a96b892254362d362c515bfb6dc6
2020-03-13 14:25:35 +01:00
Treehugger Robot
1ee63b0b05 Merge "Remove unnecessary dependency." 2020-03-13 02:13:59 +00:00
Aurimas Liutikas
cd80e3b9eb Remove unnecessary dependency.
This dependency is now defined in ALL_SDK_FILES.

Test: lunch sdk; make sdk
Change-Id: Ia740466e493d745d83039ba9991547a6c2d3bd2c
2020-03-12 16:12:27 -07:00
David Srbecky
37493d8252 Merge "Install boot.art image for host as well (used by ART tests)." 2020-03-12 18:20:42 +00:00
Yifan Hong
136764d714 Merge "Build DEVICE manifests and fragments for each SKU" 2020-03-10 19:20:06 +00: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
Treehugger Robot
83315ab6c7 Merge "Mark the current BUILD_* warnings as errors by default" 2020-03-07 20:32:41 +00:00
Dan Willemsen
97ec812708 Mark the current BUILD_* warnings as errors by default
This switches:

  BUILD_COPY_HEADERS / LOCAL_COPY_HEADERS
  BUILD_HOST_EXECUTABLE
  BUILD_HOST_SHARED_LIBRARY
  BUILD_HOST_STATIC_LIBRARY

to errors by default. Devices can set
BUILD_BROKEN_USES_BUILD_HOST_EXECUTABLE (etc) to turn these errors back
to warnings. I've done that for all of our internal devices.

Bug: 130719878
Bug: 130696912
Bug: 130722971
Bug: 130723227
Test: remove the BUILD_BROKEN_USES_* lines from a device, see errors
Change-Id: I1aecf97f64e281df3682ff0a0fb3ac4283790acd
Merged-In: I1aecf97f64e281df3682ff0a0fb3ac4283790acd
(cherry picked from commit c4bdff5f7e)
2020-03-07 11:29:29 -08:00
Treehugger Robot
055d7286ee Merge "Remove unused mips workarounds." 2020-03-07 19:22:42 +00:00
Treehugger Robot
889a8bbca0 Merge "Remove vnd*.libraries.txt from /system/etc" 2020-03-07 14:39:11 +00:00
Treehugger Robot
1c533ec092 Merge "Add an RBE setup script that developers can source to run RBE builds" 2020-03-07 06:04:38 +00:00
Elliott Hughes
f71c05a8e5 Remove unused mips workarounds.
This was never really finished, and hasn't been supported for years.

Test: treehugger
Change-Id: I7668088d1449f33025aaf36fae0817894c84a877
2020-03-06 16:46:59 -08:00
Jooyung Han
93cb9b5b31 Remove vnd*.libraries.txt from /system/etc
These files are moved to VNDK APEX.

Bug: 145184886
Test: bulid && boot
Change-Id: I85ab025e1ad490ee7704e4219c5ee611c83ca429
2020-03-07 04:54:23 +09:00
Kousik Kumar
4faa2a5352 Add an RBE setup script that developers can source to run RBE builds
Test: Ran "source build/envsetup.sh && source build/rbesetup.sh", then
ran "use_rbe m" and that worked.

Change-Id: I2413a3648e9b2ff680cab6fededc07bbdd43378f
2020-03-05 17:37:26 -08:00
Colin Cross
074d8e132b Merge "Disable goma for javac actions in Make" 2020-03-05 23:19:09 +00:00
Treehugger Robot
701cb0c069 Merge "Include .proto in sgrep()" 2020-03-05 23:12:14 +00:00
Colin Cross
28ff3e3f94 Disable goma for javac actions in Make
goma can't handle the --system argument that Android must pass to
javac.

Bug: b/143658984
Test: treehugger
Change-Id: I7091a14f940ae696930c9d4a7869ae3a81a33fbe
2020-03-05 20:46:47 +00:00
Christopher Tate
e2fe95903b Include .proto in sgrep()
Test: use in frameworks/base
Change-Id: I8104822cf69b09b3d11edb9261b8ab43029549d7
2020-03-05 11:34:16 -08:00
Treehugger Robot
90d4027542 Merge "Trim down dont_bother_goals" 2020-03-05 19:07:15 +00:00
Bill Peckham
573f458718 Merge "Don't touch .installable_files for non-FULL_BUILD" 2020-03-05 18:49:48 +00:00
Bill Yi
ffb41e8168 Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" 2020-03-05 18:27:31 +00:00
Bill Yi
a78308d97d Merge stage-aosp-master to aosp-master - DO NOT MERGE
Change-Id: I9e6ed6b978e2bc207d46bdec613f909360d62bdd
2020-03-05 09:50:55 -08:00
Automerger Merge Worker
9d5134760c Merge "initial GKI boot.img support" am: 28a7820be2
Change-Id: I620304b97f0ab8f9f440aab1c5dc8e4fe18c4819
2020-03-05 00:43:36 +00:00
Treehugger Robot
28a7820be2 Merge "initial GKI boot.img support" 2020-03-05 00:31:27 +00:00
Dan Willemsen
395358edae Trim down dont_bother_goals
This had caused the nodeps targets to break when I added the
auto-cleanup feature, as we wrote out smaller lists of what was
installed. The functionality of dont_bother_goals is also being fixed in
https://android-review.googlesource.com/c/platform/build/+/1250929/

But there's also no reason to have all of these targets in
dont_bother_goals, as they can just re-use the cached kati build graph.

Bug: 149460609
Test: m systemimage && m snod    <did not delete everything>
Test: m snod    <still see warning>
Test: codesearch for uses of MAKECMDGOALS and these targets
Change-Id: Ib8e7ba67e5ad980be4bdcf521c5156eea7941f97
2020-03-05 00:21:25 +00:00
Automerger Merge Worker
a78856cee6 Merge "Skip VNDK variant check on coverage builds." am: 791a8b5128
Change-Id: I506aac7d8dfe868ac123d7b68628e5e67864998e
2020-03-05 00:04:48 +00:00
Oliver Nguyen
791a8b5128 Merge "Skip VNDK variant check on coverage builds." 2020-03-04 23:55:32 +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
Steve Muckle
3363a0b8d6 initial GKI boot.img support
The GKI boot.img should be generated alongside the GSI. To make this
possible, define a flag (TARGET_NO_VENDOR_BOOT) that can be used to
disable the generation of the vendor_boot image.

Bug: 138323550
Change-Id: I91181853b26815e68a2fa2216b68579780d034dc
2020-03-04 10:54:56 -08:00
Automerger Merge Worker
f39863dc7a Merge "Remove a redundant setting" am: a7f84831fe
Change-Id: I809890d3de6e5bc11a0a2feb0ced12774993fbb6
2020-03-04 06:25:18 +00:00
Treehugger Robot
a7f84831fe Merge "Remove a redundant setting" 2020-03-04 06:15:11 +00:00
Automerger Merge Worker
e0bab14d71 Merge "lunch: error on >1 arg (before ignored)" am: d567ea400a
Change-Id: Ia86a91acbb7101d1a45f4af636fd4c1c531374d9
2020-03-04 00:55:25 +00:00
Steven Moreland
d567ea400a Merge "lunch: error on >1 arg (before ignored)" 2020-03-04 00:39:28 +00:00
Automerger Merge Worker
14b4bbc4a2 Merge "Uses a per-partition fingerprint for building images and avb_salt." am: b6145d320c
Change-Id: I8ca783cb0252a7b4562952835351aeef141913f9
2020-03-02 23:27:28 +00:00
Daniel Norman
b6145d320c Merge "Uses a per-partition fingerprint for building images and avb_salt." 2020-03-02 22:29:50 +00:00
Daniel Norman
d5fe862628 Uses a per-partition fingerprint for building images and avb_salt.
This causes the output image files of a merged build to be identical
to the image files of the input partial builds, for each images in
PARTITIONS_WITH_CARE_MAP.

Test: python -m unittest test_common
Test: `m dist`; `unzip out/dist/target_files.zip IMAGES/\*`;
      `zip -d out/dist/target_files.zip IMAGES/\*`
      `add_img_to_target_files -a out/dist/target_files.zip`.
      Verify that the rebuilt images are identical to the deleted ones.
Test: Build a merged target (using merge_target_files.py). Verify that
      the partial target-files.zip IMAGES are identical to the merged
      target-files.zip IMAGES for PARTITIONS_WITH_CARE_MAP images.
Bug: 150405807
Change-Id: I5fdf5783c1aff9c14cf5408090389b1f65b69ca6
2020-03-02 19:05:20 +00:00
TreeHugger Robot
098949fe60 Merge "DO NOT MERGE - Merge QQ2A.200305.003 into stage-aosp-master" into stage-aosp-master 2020-02-29 04:06:10 +00:00
Xin Li
51e18647ba DO NOT MERGE - Merge QQ2A.200305.003 into stage-aosp-master
Bug: 150410372
Change-Id: I09b3a138aa19a34400a7dfc8ef60dc52bae4c492
Merged-In: I89aaa622a1aa3a58cb6c35206be9244166f6ca84
2020-02-28 21:34:35 +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
Treehugger Robot
47b08fbab5 Merge "Move build number file to out/soong" 2020-02-28 20:15:52 +00:00
TreeHugger Robot
761a840a7f Merge "Skip QQ2A.200113.001 in stage-aosp-master" into stage-aosp-master 2020-02-28 05:58:29 +00:00
Automerger Merge Worker
b68bc994e9 Merge "Separate html/csv output functions into html_writer.py" am: cabdab0a40
Change-Id: I6903764cfe04589866b380bab5d8825f7f1013e0
2020-02-28 01:41:00 +00:00
Chih-hung Hsieh
cabdab0a40 Merge "Separate html/csv output functions into html_writer.py" 2020-02-28 01:30:12 +00:00