Commit graph

21648 commits

Author SHA1 Message Date
Yo Chiang
1876c3698d Merge "Change RRO enforcement logic"
am: 9c683dc968

Change-Id: I8a4ad0ece4e9ee0fc0112877fa0eb4d3f2b968ed
2019-10-01 19:47:50 -07:00
Yo Chiang
9c683dc968 Merge "Change RRO enforcement logic" 2019-10-02 02:34:35 +00:00
Yifan Hong
57a9fa8d77 Merge "Add virtual_ab to dynamic_partitions_info.txt"
am: 4ba2bdb13e

Change-Id: I648f81071e7e6437bf4098e133e8d787843f0970
2019-10-01 17:46:17 -07:00
Yifan Hong
4ba2bdb13e Merge "Add virtual_ab to dynamic_partitions_info.txt" 2019-10-02 00:36:24 +00:00
Jesse Pai
da558de483 Merge "Generation of C Flags Artifacts"
am: 7a4bf49fb9

Change-Id: Ic0d5d0879cfa7705b87709fce6ba34b3094f719e
2019-10-01 13:14:22 -07:00
Treehugger Robot
7a4bf49fb9 Merge "Generation of C Flags Artifacts" 2019-10-01 19:25:50 +00:00
Yo Chiang
4693fd1d05 Change RRO enforcement logic
Change RRO logic from
"Enforce RRO for all modules when PRODUCT_ENFORCE_RRO_TARGETS is '*'"
to
"Enforce RRO for all modules when PRODUCT_ENFORCE_RRO_TARGETS includes '*'"

Bug: b/137727426
Test: test build on local machine
Change-Id: I10b215c28919988ec58deb1fe3d5498ad4e73eb4
2019-10-01 15:08:36 +08:00
Bowgo Tsai
cf318328a4 Merge "recovery: install system_ext file_contexts and property_contexts"
am: 4ad561c6f8

Change-Id: I9ba28256529fed3d990e3e8ce1424024709b70a6
2019-09-30 19:45:55 -07:00
Treehugger Robot
4ad561c6f8 Merge "recovery: install system_ext file_contexts and property_contexts" 2019-10-01 02:25:50 +00:00
Mitch Phillips
0f13936988 Merge "Add phony rule for 'fuzz' in Make context, not soong."
am: 0fee5b9d55

Change-Id: I9d9db5ab452df2c7eb7ff6773227c734662ad236
2019-09-30 13:54:47 -07:00
Treehugger Robot
0fee5b9d55 Merge "Add phony rule for 'fuzz' in Make context, not soong." 2019-09-30 20:24:19 +00:00
Jesse Pai
d004692025 Generation of C Flags Artifacts
Modifications made to make/core to handle new C Flags build variables which
store which module uses which flag.
C Flags build variables generated by Soong.

Bug: 140442588
Test: Executed m dist and presubmit
Change-Id: I4c730b9dba27672c6a9f75cf35beaf6311174af0
2019-09-30 16:24:35 +00:00
Bowgo Tsai
07365dfb08 recovery: install system_ext file_contexts and property_contexts
System Ext partition is not mounted in recovery mode. Install
system_ext_file_contexts and system_ext_property_contexts into
rootdir for recovery. This is similar to how we deal with system,
product, vendor, odm *_contexts files.

Bug: 137712473
Test: m bootimage for pixel 2, system_ext_file_contexts and
      system-ext_property_contexts appear in $OUT/recovery/root/
Change-Id: I94b965d775e727fbbe26c8b715bbce3ca6179fa7
2019-09-28 09:09:37 +08:00
Steve Muckle
a65046ad3d Merge "add vendor_boot image support"
am: 1623ec97f1

Change-Id: I25761b8c37d8795741a82dcf50e88c9037a5ba83
2019-09-27 14:24:25 -07:00
Treehugger Robot
1623ec97f1 Merge "add vendor_boot image support" 2019-09-27 21:07:24 +00:00
Mitch Phillips
ceefc44008 Add phony rule for 'fuzz' in Make context, not soong.
Allows us to use dist-for-goals and produce the fuzz target packages as
part of a normal dist.

Bug: 141026328
Test: m dist fuzz
Change-Id: Idffa879eb11266bfce18e0f9164e7ef80769cbc2
2019-09-27 13:58:01 -07:00
Steve Muckle
e1b1086ef3 add vendor_boot image support
The vendor_boot partition is generated by mkbootimg and contains all the
device-specific information that used to reside in the boot partition.

Bug: 137297791
Change-Id: I5b005097b73f59857c3a2f92d693b3e67ee8424e
2019-09-27 10:26:00 -07:00
Yifan Hong
72a1367d5b Add virtual_ab to dynamic_partitions_info.txt
... so that it can be used during OTA package generation.

Bug: 141720569
Test: apply virtual A/B OTA
Change-Id: I3a1df1afb7676eed6d22be49270354119bfb5a75
2019-09-26 18:22:46 -07:00
Jooyung Han
ff6182497e Merge "cleanup: remove unused variable"
am: 90c7163e7e

Change-Id: Ibabf6ca0cd7ca8d7f3ff48cc3979dae240568176
2019-09-26 09:59:29 -07:00
Treehugger Robot
90c7163e7e Merge "cleanup: remove unused variable" 2019-09-26 16:42:41 +00:00
Jooyung Han
f251232bb1 cleanup: remove unused variable
removing an unused variable: vndk_snapshot_configs_out in
core/tasks/vndk.mk

Test: m vndk
Change-Id: I2dc76ec7e41c8b1e818ecd056526a8c61a18da92
2019-09-25 10:33:58 +09:00
Anton Hansson
67b4485ee7 Merge "Improve error message for artifacts outside requirement"
am: 82a8507e17

Change-Id: I8d49c6b2231147086439f9969fa18c67141621f3
2019-09-24 08:05:58 -07:00
Anton Hansson
ee07ef0019 Improve error message for artifacts outside requirement
Print the allowed paths as part of the error message.

Test: m
Change-Id: Ieb6303f39260ce83232b1c9a0a30e8cac76e2c9c
2019-09-24 12:40:25 +01:00
hamzeh
25422f04e8 Merge "Fix to avoid breaking aosp_x86 build"
am: 30648c3a21

Change-Id: Ice61c1e8164b44dc89515a19147477a6c148913f
2019-09-20 16:12:53 -07:00
Treehugger Robot
30648c3a21 Merge "Fix to avoid breaking aosp_x86 build" 2019-09-20 22:48:10 +00:00
hamzeh
53cedb0653 Fix to avoid breaking aosp_x86 build
Removing this section as per suggetion in comment#6 (b/139694329)

Bug: 139694329
Test: none
Change-Id: I51b0ab17aeff5897932203773bd02a4951268a73
2019-09-20 12:43:02 -07:00
Dan Shi
516a6158c8 Merge "Create a vts-core suite harness package"
am: d9bef81f7c

Change-Id: I6f393746adbe01ca5856142aba2557264172cb52
2019-09-20 11:22:14 -07:00
Dan Shi
d9bef81f7c Merge "Create a vts-core suite harness package" 2019-09-20 18:06:19 +00:00
Daniel Mentz
fd1f5ad40c Merge "Don't package mke2fs.conf in otatools.zip"
am: 8bfd896e3d

Change-Id: Iad226cac4e0d52beaf7c9c6bab2a5fdff56d6c47
2019-09-20 10:36:56 -07:00
Daniel Mentz
8bfd896e3d Merge "Don't package mke2fs.conf in otatools.zip" 2019-09-20 17:12:12 +00:00
Dan Shi
796ff4ffb5 Create a vts-core suite harness package
vts-core.zip will include all vts-core tests and suite harness
(vts-core-tradefed).

Bug: 141012181
Test: m -j vts-core

Change-Id: Ib13a2bffb4dc9619d2732d65729ecb0246a0b9a0
2019-09-19 13:13:44 -07:00
Mitch Phillips
c9a79eb8e8 Merge "Add backend for LOCAL_FUZZ_DATA for cc_fuzz corpus/dict."
am: 30e613a48d

Change-Id: I3606b86577ba2c498cae44f51c1e89076c5fc8d0
2019-09-19 07:08:42 -07:00
Treehugger Robot
30e613a48d Merge "Add backend for LOCAL_FUZZ_DATA for cc_fuzz corpus/dict." 2019-09-19 13:51:17 +00:00
Mitch Phillips
fd6d9022fe Add backend for LOCAL_FUZZ_DATA for cc_fuzz corpus/dict.
Adds the backend makefile parser for the LOCAL_FUZZ_DATA vars generated
by the cc_fuzz target.

Bug: 141026328
Test: m example_fuzzer, fuzz target should have adjacent corpus/dict
files.

Change-Id: Ide2c34318f11be132992650ce5cc1fd27895915c
2019-09-18 18:58:28 -07:00
Daniel Mentz
f846914c9f Don't package mke2fs.conf in otatools.zip
mke2fs.conf is now packaged into the Python executable mkuserimg_mke2fs
and no longer needs to be packaged directly into otatools.zip.

Change-Id: I06216ccd60f834747f9302e30397a7f0bae53726
2019-09-18 18:24:41 -07:00
Colin Cross
7fb589b429 Merge "Remove TARGET_TRANSLATE_2ND_ARCH"
am: bd496d27ad

Change-Id: Ie60e012f488c5f5447c095be07081fd809335de7
2019-09-18 13:59:43 -07:00
Treehugger Robot
bd496d27ad Merge "Remove TARGET_TRANSLATE_2ND_ARCH" 2019-09-18 20:47:43 +00:00
Colin Cross
02b50d12be Remove TARGET_TRANSLATE_2ND_ARCH
TARGET_TRANSLATE_2ND_ARCH is never set to true any more,
TARGET_NATIVE_BRIDGE_ARCH := arm is always used instead.

Bug: 141242600
Test: m checkbuild
Change-Id: Id3e0614a1d8a088d37929655b74fecd812606db2
2019-09-18 16:23:04 +00:00
Logan Chien
eb3c242228 Merge "Add check-elf-files as a checkbuild prerequisite"
am: e34b4dea34

Change-Id: Id30b1dabc63cc9ca21a47f746a4bc78cc6cb0077
2019-09-17 11:25:38 -07:00
Logan Chien
e34b4dea34 Merge "Add check-elf-files as a checkbuild prerequisite" 2019-09-17 18:08:31 +00:00
Jaewoong Jung
8ada3207fb Merge "Revert "Build: Fix test data no present in test suite zip files.""
am: 9f2e68009d

Change-Id: Ib638bed9972d14ccc277ec8aa5879b6496de7409
2019-09-17 07:23:23 -07:00
Jaewoong Jung
9f2e68009d Merge "Revert "Build: Fix test data no present in test suite zip files."" 2019-09-17 14:00:45 +00:00
Jaewoong Jung
5ea6971a1d Revert "Build: Fix test data no present in test suite zip files."
This reverts commit 068d101077.

Reason for revert: Caused a regression

Test: Added data to a sh_test and compared before vs after
Fixes: 140761783
Change-Id: Ied6427cb2dc3093fb88632eb8f337c2b76e86b95
2019-09-13 19:06:30 +00:00
Logan Chien
37e237aa71 Add check-elf-files as a checkbuild prerequisite
This commit adds `check-elf-files` as a `checkbuild` prerequisite so
that prebuilt ELF files can be checked in a `checkbuild` build bot when
`PRODUCT_CHECK_ELF_FILES` is set to `true`.

Bug: 140908693
Test: lunch aosp_walleye-userdebug && make checkbuild
Change-Id: Ifea2f7057eecbf74028e986367f2322ff851f5e4
2019-09-12 21:26:09 -07:00
Elliott Hughes
a8cfe0ec57 Merge "Remove macOS special cases pertaining to date(1)."
am: 0b67e41f3f

Change-Id: Ib03100cab82a999208bfb9248bad3ad6208a3cd5
2019-09-12 18:08:00 -07:00
Elliott Hughes
648017c2b8 Remove macOS special cases pertaining to date(1).
Bug: http://b/139450866
Test: builds
Change-Id: Idc6cc19cf1b81b51526a7d2ba78020c6decb0031
2019-09-12 15:04:16 -07:00
TreeHugger Robot
8806061821 Merge "Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master" into stage-aosp-master 2019-09-11 20:31:35 +00:00
Colin Cross
64c50b353e Merge changes from topic "protobuf-3.9.1"
* changes:
  Keep proguard fields for lite runtime
  Install vendorcompat verison of protobuf
  Make javanano a plugin
2019-09-11 18:00:16 +00:00
Bowgo Tsai
06533fef4a Moving GSI-specific properties to /system_ext
We're now adding a core CSI system.img that is common across different
targets. So GSI-specific things should be moved to /system_ext.

Also renaming various generic*/system.prop to generic*/system_ext.prop.
This is to put the customization into /system_ext/build.prop instead of
/system/build.prop.

Bug: 137711197
Test: boot a GSI on crosshatch, and checks the value of those properties
Change-Id: Id344124280d5f4a6c10d390a9e8a4a50cc7f28fb
2019-09-10 21:55:32 +08:00
Colin Cross
d30a949547 Merge "Use more variables from Soong" 2019-09-09 17:21:44 +00:00