Commit Graph

36566 Commits

Author SHA1 Message Date
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
Dan Albert 8f84dcc378 Merge "Expose PLATFORM_VERSION_ALL_CODENAMES to soong." am: 194e73dd15 am: b8989bd1b1
am: fd349adff6

Change-Id: I2cda71dc8aa865c613243dbcbdc46721f9a32ad5
2017-03-31 23:21:43 +00:00
Dan Albert fd349adff6 Merge "Expose PLATFORM_VERSION_ALL_CODENAMES to soong." am: 194e73dd15
am: b8989bd1b1

Change-Id: I4ee4da01952f114057985550f82fd5488dbf0675
2017-03-31 23:19:42 +00:00
Dan Albert b8989bd1b1 Merge "Expose PLATFORM_VERSION_ALL_CODENAMES to soong."
am: 194e73dd15

Change-Id: Ib1d690c07010622593405519b125077adfebace0
2017-03-31 23:17:12 +00:00
Dan Albert 9a9e7dd8a2 Merge "Auto-generate PLATFORM_VERSION_ALL_CODENAMES." am: 979dac690a am: e2b92d809f
am: 6861a292a0

Change-Id: I1d91765933fa76d8a83ab6932563c637f0c34163
2017-03-31 23:14:42 +00:00
Dan Albert 6861a292a0 Merge "Auto-generate PLATFORM_VERSION_ALL_CODENAMES." am: 979dac690a
am: e2b92d809f

Change-Id: I9cb0b52b1121146aa75ffff31e63ae5118ad9510
2017-03-31 23:12:11 +00:00
Dan Albert e2b92d809f Merge "Auto-generate PLATFORM_VERSION_ALL_CODENAMES."
am: 979dac690a

Change-Id: Ib4aa98fe335d90f1407ccb27fa4c57d5d30cbbf5
2017-03-31 23:09:42 +00:00
Treehugger Robot 194e73dd15 Merge "Expose PLATFORM_VERSION_ALL_CODENAMES to soong." 2017-03-31 23:09:26 +00:00
Treehugger Robot 979dac690a Merge "Auto-generate PLATFORM_VERSION_ALL_CODENAMES." 2017-03-31 23:03:20 +00:00
Dan Albert a3afbb9562 Expose PLATFORM_VERSION_ALL_CODENAMES to soong.
Test: make checkbuild
Bug: None
Change-Id: I9c8d8ff38b617ac352b951214d428f9c9af0f79d
2017-03-31 13:13:21 -07:00
Andreas Gampe 3997bbf95c Merge "Build: Force system owner for ASAN in system" am: 542c3d57d0 am: dd8293b2e7
am: df187b1ba7

Change-Id: I52132d97446e625b80a6a3e967edb3bdc2345c9d
2017-03-31 19:58:58 +00:00
Andreas Gampe df187b1ba7 Merge "Build: Force system owner for ASAN in system" am: 542c3d57d0
am: dd8293b2e7

Change-Id: I0ba058a16939b902d6f235524d26a21372568adf
2017-03-31 19:56:58 +00:00
Andreas Gampe dd8293b2e7 Merge "Build: Force system owner for ASAN in system"
am: 542c3d57d0

Change-Id: Ice7cfce4a62c636a1c97f9f4406a127564a7e552
2017-03-31 19:54:29 +00:00
Andreas Gampe 542c3d57d0 Merge "Build: Force system owner for ASAN in system" 2017-03-31 19:46:27 +00:00
Karthik Ravi Shankar 35aed3da10 Add vr binary to commands
Bug: 36071574

Change-Id: I8a953950a4eb96d9ffa2ee5789e3c8cd98b4dd0e
Signed-off-by: Karthik Ravi Shankar <karthikrs@google.com>
2017-03-31 11:17:59 -07:00
Dan Albert 839db81b26 Auto-generate PLATFORM_VERSION_ALL_CODENAMES.
Test: Temporarily added additional codenames for OPD1 -> O and
      OPM1 -> O-MR1. Lunched aosp_sailfish-eng, built build.prop and
      checked that ro.build.version.all_codenames was "O". Then
      lunched aosp_sailfish-eng-PPR1 and checked that it was
      "O,O-MR1,P".
Bug: None

Change-Id: I51189f5b40e3e7f99e2fc08bb5616c51a23e3b19
2017-03-31 10:59:02 -07:00
Vishwath Mohan 3d90b05b23 Merge "Refactor sanitized library on-disk layout - Make." am: 41b0d9e146 am: f8f29940dc
am: c4e551a6aa

Change-Id: I5f91796eb17ec3dda29c4710e60cb7da13ad4dde
2017-03-31 16:46:08 +00:00
Vishwath Mohan c4e551a6aa Merge "Refactor sanitized library on-disk layout - Make." am: 41b0d9e146
am: f8f29940dc

Change-Id: Ie2d1162df7c5f5cf88260a9663b174d7b04f3b05
2017-03-31 16:43:57 +00:00
Vishwath Mohan f8f29940dc Merge "Refactor sanitized library on-disk layout - Make."
am: 41b0d9e146

Change-Id: I5de405c714fc96e6156b07a4f64b9e8457af8124
2017-03-31 16:41:19 +00:00
Treehugger Robot 41b0d9e146 Merge "Refactor sanitized library on-disk layout - Make." 2017-03-31 16:35:53 +00:00
Hung-ying Tyan d4bee6cd32 Fix typo in build_rro_package.mk
S should be $

Bug: 36797383
Test: build sailfish
Change-Id: I06abfd76c6524368c318c965086cee6d029c4b48
2017-03-31 15:33:45 +08:00
Stephen Hines 9cfaf52cc3 Switch to clang-3859424.
Bug: http://b/36442361
Test: Build and run multiple devices/targets.

(cherry picked from commit 073ab0a707)

Change-Id: Ia057cfac4cb8185d6c6057390a9790a4657156a9
2017-03-30 22:43:53 -07:00
Stephen Hines a519f4aef2 Merge "Switch to clang-3859424." am: af077e293b am: 2e51c40eca
am: 55b63f7a4b

Change-Id: I6217cced01c6942e5a9f4eaea681d3727e197592
2017-03-31 05:00:38 +00:00
Stephen Hines 55b63f7a4b Merge "Switch to clang-3859424." am: af077e293b
am: 2e51c40eca

Change-Id: I196dcf9822c5efdb2cddc46af0656e2d7f408ef6
2017-03-31 04:58:08 +00:00
Colin Cross d75f928450 Merge "Optimize out extra jar copies" am: 678c77d9af am: cad1043266
am: bc46ba1b98

Change-Id: I8f396b1b14cd0e5b4b5a436473c42b046ecfa527
2017-03-31 04:58:06 +00:00
Stephen Hines 2e51c40eca Merge "Switch to clang-3859424."
am: af077e293b

Change-Id: If60751ecdb6621dea37346237ac127a53a2d03b8
2017-03-31 04:56:07 +00:00
Colin Cross bc46ba1b98 Merge "Optimize out extra jar copies" am: 678c77d9af
am: cad1043266

Change-Id: I626c59deaa2bae027707be1bef199f4d07434254
2017-03-31 04:56:06 +00:00
Colin Cross cad1043266 Merge "Optimize out extra jar copies"
am: 678c77d9af

Change-Id: I17a8b9bc7281c37abc0bd905cd448d9002ff515a
2017-03-31 04:53:37 +00:00
Stephen Hines af077e293b Merge "Switch to clang-3859424." 2017-03-31 04:51:10 +00:00
Colin Cross 678c77d9af Merge "Optimize out extra jar copies" 2017-03-31 04:49:13 +00:00
Vishwath Mohan b285c46bbd 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.

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-30 20:14:27 -07:00
Andreas Gampe 2c498a391b Build: Force system owner for ASAN in system
For tar-ed ASAN artifacts, enforce ownership by the system uid.

Bug: 36458146
Test: m && m SANITIZE_TARGET=true SANITIZE_TARGET_SYSTEM=true
Change-Id: I190cba3d160f15a89ef74f26e7aaa853a449929f
2017-03-31 03:04:19 +00:00