Commit Graph

34426 Commits

Author SHA1 Message Date
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 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 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
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 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
Stephen Hines 55b63f7a4b Merge "Switch to clang-3859424." am: af077e293b
am: 2e51c40eca

Change-Id: I196dcf9822c5efdb2cddc46af0656e2d7f408ef6
2017-03-31 04:58:08 +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
Colin Cross 0e53734035 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
2017-03-30 19:35:15 -07:00
Jaekyun Seok c04f526b9c Merge "Enforce RROs for all the build-time ROs" am: 4b4e203a0b
am: 2f92aa78f4

Change-Id: Ia7fbae5bcde02b847425fe1b66fa2f97cc9b249e
2017-03-30 03:47:31 +00:00
Jaekyun Seok 2f92aa78f4 Merge "Enforce RROs for all the build-time ROs"
am: 4b4e203a0b

Change-Id: I20085da5a39005733c9f10e751cef58ae20a9f7d
2017-03-30 03:43:31 +00:00
Treehugger Robot 4b4e203a0b Merge "Enforce RROs for all the build-time ROs" 2017-03-30 03:39:09 +00:00
Jaekyun Seok 39f97ae22a Enforce RROs for all the build-time ROs
This CL is to generate every static RRO package for its target package
automatically at build-time.

BOARD_ENFORCE_RRO build variable is added to specify whether enforcing
RRO is required or not.

BOARD_ENFORCE_RRO_EXEMPT_SOURCES build variable is added to specify
the module list of which item should be exempt from enforcing RRO.

Test: tested on bullhead and sailfish
Bug: 34097942
Change-Id: I455b2ce34e66c57a540c299b5e378b7c4e78d5b8
(cherry picked from commit 3070610b72)
2017-03-30 10:43:38 +09:00
Andreas Gampe 09ab1b8c67 Merge "Build: ASAN in system" am: 85473982fb
am: 4ec27c88f5

Change-Id: Ied73489f4c7b1064b1dfd52c98c5989ac2c81646
2017-03-30 01:23:52 +00:00
Andreas Gampe 4ec27c88f5 Merge "Build: ASAN in system"
am: 85473982fb

Change-Id: Ia64fbaba713c1d9d826872b62ca0dcb040f939c9
2017-03-30 01:21:51 +00:00
Treehugger Robot 85473982fb Merge "Build: ASAN in system" 2017-03-30 01:16:53 +00:00
Colin Cross af35fe9424 Merge "Revert "Revert "Revert "Add soong_javac_filter to all javac commands"""" am: df69a927d8
am: e088c648c7

Change-Id: I2d5766cf3aab0372484e5b8f7669528a2cdc9df5
2017-03-30 01:03:51 +00:00
Colin Cross e088c648c7 Merge "Revert "Revert "Revert "Add soong_javac_filter to all javac commands""""
am: df69a927d8

Change-Id: I693e6d1d2abfe0efe94e113cc3ce56691ad7f7e3
2017-03-30 01:01:51 +00:00
Treehugger Robot df69a927d8 Merge "Revert "Revert "Revert "Add soong_javac_filter to all javac commands"""" 2017-03-30 00:53:06 +00:00
Andreas Gampe 039b5c779f Build: ASAN in system
Add build system support for asan.tar.bz in the system image. This
is triggered by SANITIZE_TARGET_SYSTEM=true.

Bug: 36458146
Test: m && m SANITIZE_TARGET=true SANITIZE_TARGET_SYSTEM=true
Change-Id: I725f99f16a8c9182b1c7ad26580c73d3708f8554
2017-03-29 16:19:28 -07:00
Colin Cross fc8ead6609 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
2017-03-29 21:01:24 +00:00
Benoit Lamarche 9343fd7861 Merge "Changing default Jack arguments." am: cadf11068c
am: 8488228d9a

Change-Id: I3f1ce5f5c0d24afb890b7b2b08d89091f1b24feb
2017-03-29 08:56:20 +00:00
Benoit Lamarche 8488228d9a Merge "Changing default Jack arguments."
am: cadf11068c

Change-Id: I63ba8fb0ec5991e63e8a2fb3246ba30da8eb9fe5
2017-03-29 08:53:51 +00:00
Benoit Lamarche cadf11068c Merge "Changing default Jack arguments." 2017-03-29 08:49:32 +00:00
Stephen Hines 073ab0a707 Switch to clang-3859424.
Bug: http://b/36442361
Test: Build and run multiple devices/targets.
Change-Id: I161003f07982b1794ef5f1d1d61a48ddf45f6ab3
2017-03-28 22:11:52 -07:00
Dan Willemsen 5148a458a2 Merge "Ensure that BOARD_VNDK_VERSION is current" am: 4ef5040cc3
am: a71a8c0ae3

Change-Id: I9139b69f535b935773fa9a4aaef3c95478a72955
2017-03-29 04:42:36 +00:00
Dan Willemsen a71a8c0ae3 Merge "Ensure that BOARD_VNDK_VERSION is current"
am: 4ef5040cc3

Change-Id: I79f43fa6db5f043122fc17c2d89c03bfc0690494
2017-03-29 04:40:05 +00:00
Treehugger Robot 4ef5040cc3 Merge "Ensure that BOARD_VNDK_VERSION is current" 2017-03-29 04:34:29 +00:00
Colin Cross 4859177dd9 Merge "Add min and max supported versions" am: ae4779e254
am: e611741d85

Change-Id: I392213b405efb58d8aa3fb3b2151280d4426d380
2017-03-29 00:51:21 +00:00
Colin Cross e611741d85 Merge "Add min and max supported versions"
am: ae4779e254

Change-Id: Ic6d0fb99e95d55253be00f7b191d3287a207c2c8
2017-03-29 00:49:20 +00:00
Treehugger Robot ae4779e254 Merge "Add min and max supported versions" 2017-03-29 00:42:47 +00:00
Colin Cross 96c28f9670 Merge "Move comments to the previous line" am: 906a3ea5d6
am: 8fb3f39bcd

Change-Id: Ic2db6854999265f15cad5655ee84745ce4cc5f17
2017-03-28 22:34:41 +00:00
Colin Cross 8fb3f39bcd Merge "Move comments to the previous line"
am: 906a3ea5d6

Change-Id: I70787abb1a80987fb89a4444c68b9658c80c0622
2017-03-28 22:27:44 +00:00
Treehugger Robot 906a3ea5d6 Merge "Move comments to the previous line" 2017-03-28 22:17:52 +00:00
Colin Cross c901659377 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
2017-03-28 13:32:04 -07:00
Colin Cross 349a7a7f1a Move comments to the previous line
End-of-line comments cause the variable to be set to a space, which
confuses using ifdef on it.

Test: builds
Change-Id: I7b1eb3b9febff1a5a5fca1e6623b2b36d538dacc
Merged-In: I7b1eb3b9febff1a5a5fca1e6623b2b36d538dacc
2017-03-28 13:24:45 -07:00