Commit Graph

36497 Commits

Author SHA1 Message Date
Dan Willemsen 05909fae9f Add LOCAL_EXPORT_CFLAGS for Soong
This lets Soong pass -isystem or -I as necessary (or potentially, even
other cflags in the future).

This is not available for Android.mk use, nor exposed directly to
Android.bp users.

Test: m -j
Change-Id: Id37d4692d5fbddce467bd777903b20169f44dd6e
2017-04-05 01:04:18 +00:00
Dan Willemsen efa8477fb4 Merge "Exclude ndk stubs from notice file list" am: b923eb60cd am: 376d29284a
am: 3ae9924032

Change-Id: Ieffc9535cafe96f2c7873bed21e86efa5e794fc4
2017-04-05 00:22:40 +00:00
Dan Willemsen 3ae9924032 Merge "Exclude ndk stubs from notice file list" am: b923eb60cd
am: 376d29284a

Change-Id: I748095028e09742a61ecada07e25d918f9d4fd10
2017-04-05 00:15:39 +00:00
Dan Willemsen 376d29284a Merge "Exclude ndk stubs from notice file list"
am: b923eb60cd

Change-Id: I2243e2dd534b602d983a8233d1499e7063d10a05
2017-04-05 00:13:39 +00:00
Treehugger Robot b923eb60cd Merge "Exclude ndk stubs from notice file list" 2017-04-05 00:09:01 +00:00
Dan Willemsen 2be559488d Exclude ndk stubs from notice file list
There are many references to ndk stub libraries in the third party
notices:

out/soong/ndk/platforms/android-10/arch-arm/usr/lib/libc.so
out/soong/ndk/platforms/android-10/arch-arm/usr/lib/liblog.so
...

These are just stub libraries, and aren't distributed on the device. The
real versions of these libraries will be distributed on the device, and
already have the license information.

So let Soong set LOCAL_NO_NOTICE_FILE to prevent these from appearing.

Bug: 36867708
Test: Diff aosp_arm's system/etc/NOTICE.html.gz file before/after
Change-Id: Ifa3693bde7d3b6b9dc7a83122f9cfa24997fac50
2017-04-04 14:59:55 -07:00
Jin Qian 5738b9bb76 Makefile: copy mke2fs.conf to ota root
am: abcec5e0bf

Change-Id: Ia4deec66bf37bd052c811f6057828f27d8428023
2017-04-04 21:58:01 +00:00
Jin Qian abcec5e0bf Makefile: copy mke2fs.conf to ota root
Bug: 34947454
Change-Id: I99999c4f56df295c0bb028daf3dcc0898176c5ed
(cherry picked from commit 53524b5da9)
2017-04-04 18:19:45 +00:00
Steven Moreland 64a5de1116 Merge "ENABLE_TREBLE is deprecated" into oc-dev
am: ef8716c93a

Change-Id: I6bbfbcec37b30278c3343248e4c10f55e025d446
2017-04-04 16:38:22 +00:00
Steven Moreland ef8716c93a Merge "ENABLE_TREBLE is deprecated" into oc-dev 2017-04-04 16:31:28 +00:00
Jaekyun Seok 40a003350d Merge "Use product-based inclusive rule for enforcing RRO" am: 4f566f3f97 am: 78a117d801
am: b723db8fdd

Change-Id: I7388d7fe148332a027b7cdf88101f5a159a9f756
2017-04-04 04:47:39 +00:00
Jaekyun Seok b723db8fdd Merge "Use product-based inclusive rule for enforcing RRO" am: 4f566f3f97
am: 78a117d801

Change-Id: If81f9136cd10deb9a7bdd9d623639eff6dfd8a8c
2017-04-04 04:44:08 +00:00
Jaekyun Seok 78a117d801 Merge "Use product-based inclusive rule for enforcing RRO"
am: 4f566f3f97

Change-Id: Iaa5ec37c9d6d0e9c2dfe9573b61465e127d60f8d
2017-04-04 04:40:08 +00:00
Treehugger Robot 4f566f3f97 Merge "Use product-based inclusive rule for enforcing RRO" 2017-04-04 04:34:36 +00:00
Jaekyun Seok 785a6f48dd Merge "Use product-based inclusive rule for enforcing RRO" into oc-dev
am: 74e7a2dbeb

Change-Id: Id33d70c9d3d9465d3218e324d88adc4724bd394a
2017-04-04 02:34:00 +00:00
Jaekyun Seok 1b2242895e Use product-based inclusive rule for enforcing RRO
Board-based rule can cause unexpected regression because build-time overlays
are different among products. So each product should be tested with its own
product-based rule considering its build-time overlays before applying
enforcing RRO.

Additionally RRO conversion is mandatory only for overlays of which target is
included in AOSP system image and is critical for CTS/VTS tests with AOSP
system image. So inclusive rule is more suitable instead of exclusive rule
to avoid unexpected regression due to unnecessary RRO conversion.

Note that we still support conversion for all the overlays by specifying
PRODUCT_ENFORCE_RRO_TARGETS as "*".

Test: building succeeded and tested with auto-generated RROs.
Bug: 36231603
Change-Id: I8e1d701d4f78b818c89ef3e7638110105370c5bc
(cherry picked from commit 2a209997e8)
2017-04-04 11:31:24 +09:00
TreeHugger Robot 74e7a2dbeb Merge "Use product-based inclusive rule for enforcing RRO" into oc-dev 2017-04-04 02:27:01 +00:00
Alex Deymo 4775eb67db Merge "Don't include the dev-key on IOT products." am: 41febee0cc am: b20d1d7a74
am: b83d6d50ab

Change-Id: I09c22951828599f7d0b3f290d0297bc06455528c
2017-04-04 00:57:10 +00:00
Alex Deymo b83d6d50ab Merge "Don't include the dev-key on IOT products." am: 41febee0cc
am: b20d1d7a74

Change-Id: Id31abf9343870de33248269fe23b3c6c75ee7431
2017-04-04 00:53:08 +00:00
Alex Deymo b20d1d7a74 Merge "Don't include the dev-key on IOT products."
am: 41febee0cc

Change-Id: I1825d82eac9b046c76d35bbb93bae31f86fd2be5
2017-04-04 00:49:40 +00:00
Treehugger Robot 41febee0cc Merge "Don't include the dev-key on IOT products." 2017-04-04 00:43:35 +00:00
Alex Deymo cec578c916 Don't include the dev-key on IOT products.
This patch updates the logic to use the PRODUCT_IOT variable instead of
BRILLO.

Bug: 36702887
Test: `make`; Image doesn't have the dev key.
Change-Id: I1751e97d8cdfeba83c7e4720a017a5f4dcfd49da
2017-04-03 15:04:35 -07:00
Elliott Hughes b2fedccb26 Merge "fsconfig: Use defined macro for masking" am: 35eaf52ee2 am: d83bb4193a
am: ced2e48998

Change-Id: I9819032f3d0473cb307e96b96331cd753b871e69
2017-04-03 21:35:42 +00:00
Elliott Hughes ced2e48998 Merge "fsconfig: Use defined macro for masking" am: 35eaf52ee2
am: d83bb4193a

Change-Id: Ie5fb625707a7e59bd623130617515674c908f0a6
2017-04-03 21:31:40 +00:00
Elliott Hughes d83bb4193a Merge "fsconfig: Use defined macro for masking"
am: 35eaf52ee2

Change-Id: I291e16fba756e661dcd56722b957ce68bc055c9b
2017-04-03 21:28:10 +00:00
Elliott Hughes 35eaf52ee2 Merge "fsconfig: Use defined macro for masking" 2017-04-03 21:21:55 +00:00
Elliott Hughes d36d82a117 resolve merge conflicts of 7206a3b38c to oc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ib00dfc08b1ca7223d49b18fceab780c5dbec0d7e
2017-04-03 10:48:05 -07:00
Elliott Hughes 7206a3b38c Merge "Switch to a shell_and_utilities phony module." am: cdcc4c52aa
am: b7b29357ae

Change-Id: I08efbab350cb47bfb63c706c49130b70461a205c
2017-04-03 17:22:58 +00:00
Elliott Hughes b7b29357ae Merge "Switch to a shell_and_utilities phony module."
am: cdcc4c52aa

Change-Id: Idb8a4ce418a64ac8691df9d1890d60f32102c1cc
2017-04-03 17:19:35 +00:00
Elliott Hughes cdcc4c52aa Merge "Switch to a shell_and_utilities phony module." 2017-04-03 17:15:17 +00:00
Elliott Hughes c86ea11fe9 Switch to a shell_and_utilities phony module.
(cherrypick of cb7d59687483c9532beecde60fe96053eda76948.)

Bug: N/A
Test: builds
Change-Id: I6416d9dded4cc225f57f0a521cf6114f39203ece
2017-04-03 17:13:58 +00:00
Colin Cross 23854148f6 Merge changes Ib7268cbf,I6658edb7,I4f19c31c into oc-dev
am: 7ef1ce5eb8

Change-Id: Ibaf5545800ed1f9ce0d73f592fc396712a910174
2017-04-03 17:05:24 +00:00
Colin Cross 7ef1ce5eb8 Merge changes Ib7268cbf,I6658edb7,I4f19c31c into oc-dev
* changes:
  Optimize out extra jar copies
  Revert "Revert "Revert "Add soong_javac_filter to all javac commands"""
  Add min and max supported versions
2017-04-03 16:47:32 +00:00
doheon1.lee 5cd3bcab86 fsconfig: Use defined macro for masking
Mask opeation with CAP_ prefixed name can be wrapped with
CAP_MASK_LONG macro.

Change-Id: Ide31ad62fac0d28e7a02e45059fe6d2461da7e27
2017-04-03 15:17:06 +09:00
Steven Moreland 417fc4f445 ENABLE_TREBLE is deprecated
ENABLE_TREBLE is deprecated...removing obsolete code fragments related
to the flag.

Test: marlin boots/works
aosp_arm64_ab boots/works on sailfish/marlin

Bug: 32978887
Change-Id: I59b4509e4e7ec11cfa138200bccc4418c10b44f3
2017-04-03 12:27:51 +09:00
Hung-ying Tyan 6ba42f8684 Merge "Fix typo in build_rro_package.mk" into oc-dev
am: 7442f7bdaa

Change-Id: I76d65d71b7dc089669c23b21ad9fa8b49b0473e0
2017-04-01 09:37:50 +00:00
TreeHugger Robot 7442f7bdaa Merge "Fix typo in build_rro_package.mk" into oc-dev 2017-04-01 09:34:22 +00:00
Vishwath Mohan 926aadbc28 Merge "Refactor sanitized library on-disk layout - Make." into oc-dev
am: 07029188f6

Change-Id: Ic852bca174aed7de3085a9048a1e0199acd93e4f
2017-04-01 04:28:45 +00:00
TreeHugger Robot 07029188f6 Merge "Refactor sanitized library on-disk layout - Make." into oc-dev 2017-04-01 04:18:34 +00:00
Stephen Hines 43ecade725 Merge "Switch to clang-3859424." into oc-dev
am: f770f1f169

Change-Id: I72a03b71d8f862e019856d16122edd969a7ac158
2017-04-01 03:56:30 +00:00
Stephen Hines f770f1f169 Merge "Switch to clang-3859424." into oc-dev 2017-04-01 03:53:16 +00:00
Andreas Gampe ebed58ba23 Merge "Build: Force system owner for ASAN in system" into oc-dev
am: e66d75164c

Change-Id: I7becadc3a3cedf9afb61f09f2e4f77cf681f6190
2017-04-01 02:45:54 +00:00
TreeHugger Robot e66d75164c Merge "Build: Force system owner for ASAN in system" into oc-dev 2017-04-01 02:36:34 +00:00
Colin Cross 71b86c6201 Optimize out extra jar copies
Don't copy jar files for disabled stages.  Instead, set the name of
the output to the name of the input so the next stage will directly
pick up the output of the previous stage.

Test: m -j ANDROID_COMPILE_WITH_JACK=false java
Change-Id: Ib7268cbff7ea7ff2ad2caf994aa145e1b7a12b83
(cherry picked from commit 0e53734035)
2017-03-31 18:39:33 -07:00
Colin Cross 37a1d5bc93 Revert "Revert "Revert "Add soong_javac_filter to all javac commands"""
This reverts commit 440079b84b.

Adding the pipe interferes with error codes, which results
in an empty classes-full-debug.jar output file being left
after the failure.  The next build sees the output file with
an up-to-date timestamp and doesn't rerun the failing rule.

Bug: 36666657
Change-Id: I6658edb766d8ba3120f88e3d8d6eda6ea6c691da
(cherry picked from commit fc8ead6609)
2017-03-31 18:39:33 -07:00
Colin Cross f658305484 Add min and max supported versions
Add MIN_PLATFORM_VERSION and MAX_PLATFORM_VERSION to track
the range of releases that are expected to be released from
the current branch.

Also simplify version_defaults.mk by moving most of the code
to envsetup.mk.

Test: build/make/tests/envsetup_tests.sh
Change-Id: I4f19c31c267e202f8f5ba1384a8b4385d725f9d7
(cherry picked from commit c901659377)
2017-03-31 18:39:12 -07:00
Vishwath Mohan 62720dacbc Refactor sanitized library on-disk layout - Make.
This CL moves the location of ASAN-ified libraries on disk in the
following manner:
/data/lib* --> /data/asan/system/lib*
/data/vendor/* --> /data/asan/vendor/*

There are a couple of advantages to this, including better isolation
from other components, and more transparent linker renaming and
SELinux policies.

(cherry picked from commit b285c46bbd)

Bug: 36574794
Bug: 36674745
Test: m -j40 && SANITIZE_TARGET="address" m -j40 and the device
boots. All sanitized libraries are correctly located in /data/asan/*.

Change-Id: Ic6ba8e43e31df2ea92b85fd60f572823b6883ba2
2017-03-31 17:22:14 -07:00
Karthik Ravi Shankar a8c5d8cbb6 Merge "Add vr binary to commands" into oc-dev
am: 4afcb8c6b6

Change-Id: I91444d4418952e100445f6a9e52d617d7fb11c0e
2017-03-31 23:58:26 +00:00
TreeHugger Robot 4afcb8c6b6 Merge "Add vr binary to commands" into oc-dev 2017-03-31 23:48:25 +00:00
Andreas Gampe e5339ae1d2 Build: Force system owner for ASAN in system
For tar-ed ASAN artifacts, enforce ownership by the system uid.

(cherry picked from commit 2c498a391b)

Bug: 36458146
Test: m && m SANITIZE_TARGET=true SANITIZE_TARGET_SYSTEM=true
Change-Id: I190cba3d160f15a89ef74f26e7aaa853a449929f
2017-03-31 16:44:09 -07:00