Commit Graph

36445 Commits

Author SHA1 Message Date
Colin Cross
6fabefa88e Move proguard before classes.jar
Downstream users of a library always link against javalib.jar, which
is either the dex jar for java libraries or a copy of
proguard.classes.jar for static java libraries.  In preparation for
making java libraries a superset of static java libraries, make
classes.jar always be the final class-containing jar for use
downstream, and always create a classes-pre-proguard.jar for
users that need a jar without shrinking or obfuscation.

Also rename the intermediates to be consitent: classes-<tool>.jar

Test: m -j ANDROID_COMPILE_WITH_JACK=false java
Change-Id: I3df8b9a4edcd5db996f1fedc54c8a782d4f36a92
2017-04-01 08:46:27 -07:00
Stephen Hines
aac5674015 Merge "Switch to clang-3859424." am: af077e293b am: 2e51c40eca am: 55b63f7a4b
am: a519f4aef2

Change-Id: I529dd81faedd155ee22e483e43320575023b7e0a
2017-03-31 05:03:08 +00: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
Colin Cross
85b7faecf0 Merge "Optimize out extra jar copies" am: 678c77d9af am: cad1043266 am: bc46ba1b98
am: d75f928450

Change-Id: I0a2059ab73a7b6315cae3cc4307f75d925faa511
2017-03-31 05:00:36 +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
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
Andreas Gampe
f0f4c6eddd Merge "Build: ASAN in system" into oc-dev am: 2100bc6835
am: 0749f43162

Change-Id: Id97cc40f3086ff2ee6ec84c695508530f76b1092
2017-03-30 16:48:47 +00:00
Andreas Gampe
0749f43162 Merge "Build: ASAN in system" into oc-dev
am: 2100bc6835

Change-Id: I2f60d87ddbefff2c16a4a0278a747d123c884a73
2017-03-30 16:45:47 +00:00
TreeHugger Robot
2100bc6835 Merge "Build: ASAN in system" into oc-dev 2017-03-30 16:41:35 +00:00
Nicolas Geoffray
287ae433d3 Merge "Don't preopt system server apps in system_other." into oc-dev am: 41547f5de4
am: 68aea97535

Change-Id: Ibc8a9f71cefed3db6c20cbecda067a8888482027
2017-03-30 13:56:07 +00:00
Nicolas Geoffray
68aea97535 Merge "Don't preopt system server apps in system_other." into oc-dev
am: 41547f5de4

Change-Id: I03ac6d0b507371e5a8ef3d58d84394e22d1b1754
2017-03-30 13:53:38 +00:00
Nicolas Geoffray
fc14624185 Introduce a whitelist for core apps used by system server. am: 7d32b8bb4f
am: 58554adb9a

Change-Id: Iff086d1f21ab6f73756949c7f234218235e46bc6
2017-03-30 13:53:38 +00:00
Nicolas Geoffray
41547f5de4 Merge "Don't preopt system server apps in system_other." into oc-dev 2017-03-30 13:52:01 +00:00
Nicolas Geoffray
58554adb9a Introduce a whitelist for core apps used by system server.
am: 7d32b8bb4f

Change-Id: Ia7e107be9ff3e36ce918446a0a598d7c09d56f20
2017-03-30 13:51:37 +00:00
Nicolas Geoffray
eaa9d88cf4 Don't preopt system server apps in system_other.
bug:36532541
bug:33799337

Test: m -j32 && find out/target -name \*.odex

Change-Id: Id5a153efd303d47612b238833f6205949bf2812f
(cherry picked from commit a2c6c0b11e)
2017-03-30 11:49:25 +00:00
Nicolas Geoffray
7d32b8bb4f Introduce a whitelist for core apps used by system server.
And by default 'speed' compile those apps at build time.

bug:33799337
Test: m -j32
Change-Id: I7be3bbfef59c020a34b9a82ef038bd27210bc9d7
(cherry picked from commit 9af483488a)
2017-03-30 11:47:13 +00:00
Nicolas Geoffray
005a8650e0 Merge changes Id5a153ef,I7be3bbfe
* changes:
  Don't preopt system server apps in system_other.
  Introduce a whitelist for core apps used by system server.
2017-03-30 11:46:52 +00:00
Jiyong Park
9303378cfd Remove marlin/sailfish specific sepolicy am: 6fdf938751
am: a0315d051b

Change-Id: I2539bfd61815683e6d8ecadb354a50172c40736a
2017-03-30 07:51:47 +00:00
Jiyong Park
a0315d051b Remove marlin/sailfish specific sepolicy
am: 6fdf938751

Change-Id: I76638cb2f1eb9d9f367161c53594c5138cfef05a
2017-03-30 07:47:17 +00:00
Jiyong Park
6fdf938751 Remove marlin/sailfish specific sepolicy
Don't use sepolicy dir for marlin/sailfish.

Bug: 36231802
Test: aosp_arm64_ab should boot
Change-Id: I0e76841530cec2c51b61251ffde802bd7ec10663
2017-03-30 14:25:41 +09:00
Jaekyun Seok
de11e12f92 Merge "Enforce RROs for all the build-time ROs" am: 4b4e203a0b am: 2f92aa78f4 am: c04f526b9c
am: 6f39a5e31b

Change-Id: Ib63142200b6f1d33e8e2bae72e5f6cdb2dc9122f
2017-03-30 03:55:32 +00:00
Jaekyun Seok
6f39a5e31b Merge "Enforce RROs for all the build-time ROs" am: 4b4e203a0b am: 2f92aa78f4
am: c04f526b9c

Change-Id: I9fae908eaa40fca7e8cf0de23fcddcba2968b427
2017-03-30 03:51:03 +00: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
a92434f4c0 Build: ASAN in system
Add build system support for asan.tar.bz in the system image. This
is triggered by SANITIZE_TARGET_SYSTEM=true.

(cherry picked from commit 039b5c779f)

Bug: 36458146
Test: m && m SANITIZE_TARGET=true SANITIZE_TARGET_SYSTEM=true
Change-Id: I725f99f16a8c9182b1c7ad26580c73d3708f8554
2017-03-29 18:36:24 -07:00
Andreas Gampe
25b566d1b8 Merge "Build: ASAN in system" am: 85473982fb am: 4ec27c88f5 am: 09ab1b8c67
am: 2753b49718

Change-Id: Ie82d01c52158d252aa5d86edf0f62ba1ac9159ef
2017-03-30 01:31:52 +00:00
Andreas Gampe
2753b49718 Merge "Build: ASAN in system" am: 85473982fb am: 4ec27c88f5
am: 09ab1b8c67

Change-Id: Ic64295b6ec6437e20a66a75878d7f1a3d8c83aac
2017-03-30 01:25:53 +00: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
c7c9f39eea Merge "Revert "Revert "Revert "Add soong_javac_filter to all javac commands"""" am: df69a927d8 am: e088c648c7 am: af35fe9424
am: 52573ac615

Change-Id: I6bdf33bb9ceb8fd13afbc0ce12ddb378bc2595f6
2017-03-30 01:08:22 +00:00
Colin Cross
52573ac615 Merge "Revert "Revert "Revert "Add soong_javac_filter to all javac commands"""" am: df69a927d8 am: e088c648c7
am: af35fe9424

Change-Id: I067770d5129653c8502a5db020d963f1a0d8b43b
2017-03-30 01:06:21 +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
296f4c87fd Merge "Changing default Jack arguments." am: cadf11068c am: 8488228d9a am: 9343fd7861
am: b49cd86f1e

Change-Id: I4ca8eeea5325b855bfec33bd453dbed016f2c41e
2017-03-29 09:00:53 +00:00
Benoit Lamarche
b49cd86f1e Merge "Changing default Jack arguments." am: cadf11068c am: 8488228d9a
am: 9343fd7861

Change-Id: Ibe69206870f4080d8ac3b069e7b7e37bef2623ba
2017-03-29 08:58:21 +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