Commit Graph

38695 Commits

Author SHA1 Message Date
Mathieu Chartier 6e9388fd0c Add PRODUCT_SYSTEM_SERVER_DEBUG_INFO property
Used for specifying if a product should get system server mini debug
info. Defaults to true.

Can be disabled by doing
PRODUCT_SYSTEM_SERVER_DEBUG_INFO := false

The property overrides WITH_DEXPREOPT_DEBUG_INFO, so if
PRODUCT_SYSTEM_SERVER_DEBUG_INFO is true but
WITH_DEXPREOPT_DEBUG_INFO is false, system server will have mini
debug info.

(cherry picked from commit 94f5f93236)

Bug: 62862291
Test: make

Merged-In: I189cd144ce3ade5f02855db022874c8dd45cbdf3
Change-Id: I189cd144ce3ade5f02855db022874c8dd45cbdf3
2017-07-28 19:41:43 -07:00
Mathieu Chartier 7f7faa1bea Add product system server compiler filter property
The product only needs to specify
PRODUCT_SYSTEM_SERVER_COMPILER_FILTER. This determines what compiler
filter system server jars are compiled with.

(cherry picked from commit 6a90210c62)

Test: update marlin device
Test: make and look at services.odex

Bug: 62356545

Merged-In: Id51726ae03576d7b4eb784b861158bb451c39deb
Change-Id: Id51726ae03576d7b4eb784b861158bb451c39deb
2017-07-28 19:41:34 -07:00
Mathieu Chartier c957a121b1 Allow custom compiler filters for system server jars
Passing down a compiler filter in LOCAL_DEX_PREOPT_FLAGS or
PRODUCT_DEX_PREOPT_DEFAULT_FLAGS will no longer always get
overridden to speed.

(cherry picked from commit b8d3cc02cd)

Bug: 62356545
Test: make and flash

Merged-In: I8b777c8881cba6b11cda56d27f0a714c92d70d94
Change-Id: I8b777c8881cba6b11cda56d27f0a714c92d70d94
2017-07-28 19:41:22 -07:00
Tobias Thierer a6c76c77ca Merge "Allow builds with costum toolchains." am: 1d9689b3e7 am: b95ebd36c5
am: f932fdbca1

Change-Id: I8823d940509a2fc3710c1ad36ba5140adf92f5ad
2017-07-27 10:49:37 +00:00
Tobias Thierer 6fc5437531 Merge "Build: Experimental option to default to -source 1.9 -target 1.9" am: 67352ffa1f am: 1e00ce0eaa
am: a32ca520fa

Change-Id: I56ab8e99c2e7cc3c70116b4dfa82291328897020
2017-07-27 10:49:14 +00:00
Tobias Thierer f932fdbca1 Merge "Allow builds with costum toolchains." am: 1d9689b3e7
am: b95ebd36c5

Change-Id: I05a87440c1d18c9a4fe420a76fc877afd340903e
2017-07-27 10:46:42 +00:00
Tobias Thierer a32ca520fa Merge "Build: Experimental option to default to -source 1.9 -target 1.9" am: 67352ffa1f
am: 1e00ce0eaa

Change-Id: Ida46ba19b144ded60e861bac96eb20445a9f2dca
2017-07-27 10:46:14 +00:00
Tobias Thierer b95ebd36c5 Merge "Allow builds with costum toolchains."
am: 1d9689b3e7

Change-Id: I240c81333172090d3d36a14c3a23d32017d30d5b
2017-07-27 10:43:38 +00:00
Tobias Thierer 1e00ce0eaa Merge "Build: Experimental option to default to -source 1.9 -target 1.9"
am: 67352ffa1f

Change-Id: If8ddf113caef943aad5e0b6ebaee01a6f3e41a4c
2017-07-27 10:43:13 +00:00
Tobias Thierer 1d9689b3e7 Merge "Allow builds with costum toolchains." 2017-07-27 10:41:18 +00:00
Tobias Thierer 67352ffa1f Merge "Build: Experimental option to default to -source 1.9 -target 1.9" 2017-07-27 10:40:43 +00:00
Colin Cross 963a68d927 Merge "Revert "Compile with javac by default"" am: 9143549df7 am: 02e0f6c1db
am: 14557ce870

Change-Id: I1ea143b961010a23c57e8926d9f1da9de2e49fff
2017-07-27 06:19:14 +00:00
Colin Cross 14557ce870 Merge "Revert "Compile with javac by default"" am: 9143549df7
am: 02e0f6c1db

Change-Id: I8455ff91c8e9c0a81e26f438d198feccd1ab237a
2017-07-27 06:14:07 +00:00
Colin Cross 02e0f6c1db Merge "Revert "Compile with javac by default""
am: 9143549df7

Change-Id: I76ffe1d799adc274ac8f171b897935998e5999ce
2017-07-27 06:11:41 +00:00
Colin Cross 9143549df7 Merge "Revert "Compile with javac by default"" 2017-07-27 06:04:02 +00:00
Colin Cross 36062e8076 Revert "Compile with javac by default"
This reverts commit 268dfa4d91.

Bug: 36902714
Change-Id: I69edf1a52300b50c45bd02c203f8843963357506
2017-07-27 06:02:15 +00:00
Jiyong Park da86c362ce Merge "Don't add .vendor suffix for vendor-only modules" am: 28989a9a22 am: 8f793af35c
am: 739ce549ae

Change-Id: Ifdbe16b834532e29116aaef55b22c38472ed350b
2017-07-27 00:55:09 +00:00
Colin Cross e63119f91f Merge "Compile with javac by default" am: 262d597530 am: 6d6e0f7c75
am: ec20a71b46

Change-Id: If2dfb91709f8bdab7dc3e7634a7001d78de66e2d
2017-07-27 00:54:48 +00:00
Jiyong Park 739ce549ae Merge "Don't add .vendor suffix for vendor-only modules" am: 28989a9a22
am: 8f793af35c

Change-Id: I726742d6a27eed263ec025dfc1976fcc3677ea2a
2017-07-27 00:32:01 +00:00
Colin Cross ec20a71b46 Merge "Compile with javac by default" am: 262d597530
am: 6d6e0f7c75

Change-Id: Ie7581b944c0a6aae54103d07cd81c08e301c8c7e
2017-07-27 00:30:40 +00:00
Jiyong Park 8f793af35c Merge "Don't add .vendor suffix for vendor-only modules"
am: 28989a9a22

Change-Id: I8f123f26ec3eb0c1d6607a21dfa7996284a68119
2017-07-27 00:24:42 +00:00
Colin Cross 6d6e0f7c75 Merge "Compile with javac by default"
am: 262d597530

Change-Id: I5c75de4976004dccdd23f542030438302674c081
2017-07-27 00:21:37 +00:00
Dan Willemsen 3e89981293 Merge "Only run Kati twice on a clean build due to clean_steps.mk" am: 76a75aa72d am: a1df6ed0ee
am: 5cb7217822

Change-Id: I54d440efb9915c7508c9a5e0b3ba33d2e0211a21
2017-07-27 00:13:39 +00:00
Treehugger Robot 28989a9a22 Merge "Don't add .vendor suffix for vendor-only modules" 2017-07-26 23:57:41 +00:00
Jiyong Park a9c4c71756 Don't add .vendor suffix for vendor-only modules
Soong now adds .vendor suffix only for modules having both core and
vendor variants. Furthermore, names listed in LOCAL_SHARED_LIBRARIES
are correct (= have .vendor suffix when the dependent lib has variants).
Therefore, make does not need to force add .vendor suffix when parsing
modules from soong.

Bug: 37480243
Test: BOARD_VNDK_VERSION=current m -j <name> is successful, where <name>
is one of the vendor-only libraries in Soong. (i.e.
android.hardware.renderscript@1.0-impl)
Test: m -j does not break anything

Change-Id: Id8d0d01313c63496a10de4cd3ddb9f75180efef6
2017-07-27 08:54:43 +09:00
Colin Cross 262d597530 Merge "Compile with javac by default" 2017-07-26 23:52:34 +00:00
Dan Willemsen 5cb7217822 Merge "Only run Kati twice on a clean build due to clean_steps.mk" am: 76a75aa72d
am: a1df6ed0ee

Change-Id: I2d66cc08f94106e2b10296e8eedb37884b13d046
2017-07-26 23:48:24 +00:00
Colin Cross 268dfa4d91 Compile with javac by default
javac is replacing jack as the default compiler for platform builds.

Bug: 36902714
Test: m -j checkbuild
Test: https://android-build.googleplex.com/builds/view-workplan?viewType=Table&workplanId=L50600000086240009&nodeType=Trybot
Test: sailfish-userdebug boots and basic interactions work
Test: art tests pass
Test: libcore tests pass
Change-Id: I1c3857f64eafa445ad1b9dd94eff85bef05f4649
2017-07-26 23:42:23 +00:00
Dan Willemsen a1df6ed0ee Merge "Only run Kati twice on a clean build due to clean_steps.mk"
am: 76a75aa72d

Change-Id: I9736f9161dd05797e84e0a92fe4a2234e2c008eb
2017-07-26 23:42:12 +00:00
Dan Willemsen 76a75aa72d Merge "Only run Kati twice on a clean build due to clean_steps.mk" 2017-07-26 23:28:00 +00:00
Dan Willemsen eba39713c8 Merge changes I863200b2,Ifdd9663b am: 770a498e99 am: 10e9d25035
am: 1761a50f5f

Change-Id: Ia50645f20aaa01796536f784baf06605604008cd
2017-07-26 21:53:59 +00:00
Dan Willemsen 1761a50f5f Merge changes I863200b2,Ifdd9663b am: 770a498e99
am: 10e9d25035

Change-Id: Icbf8da37e0e518b619fced846e70ef3eba8bfea9
2017-07-26 21:49:36 +00:00
Dan Willemsen 10e9d25035 Merge changes I863200b2,Ifdd9663b
am: 770a498e99

Change-Id: Id9e3dd9d5e8ac3d85d5203dd6430243d9daf01bf
2017-07-26 21:45:04 +00:00
Dan Willemsen 770a498e99 Merge changes I863200b2,Ifdd9663b
* changes:
  Run `uname -sm` once, don't use python for HOST_OS_EXTRA
  Stop calling `java -version`, remove HOST_JDK_IS_64BIT_VERSION
2017-07-26 21:31:05 +00:00
Tobias Thierer d61f28bf56 Build: Experimental option to default to -source 1.9 -target 1.9
Enabled via:

export EXPERIMENTAL_USE_OPENJDK9=true

Other nonempty values of EXPERIMENTAL_USE_OPENJDK9 will
allow OpenJDK 9 toolchains, but will still default to
-source 1.8 and -target 1.8.

Note that -source 1.9 and -target 1.9 does not currently
successfully build.

Test: Treehugger.
Bug: 38177569

Experimental flag to set LOCAL_JAVA_LANGUAGE_VERSION := 1.9

Change-Id: I9eb881b3fbd1806984a132f6da7b5a4cc6612247
2017-07-26 22:24:15 +01:00
Dan Willemsen ce7f8dd15a Run `uname -sm` once, don't use python for HOST_OS_EXTRA
This saves 20-50ms for `lunch` (~7-10%), and double that for every build
execution.

Test: Check HOST_OS_EXTRA on Linux & Mac
Change-Id: I863200b2287c8867f40606237895b1d3ad91e1b3
2017-07-26 10:49:22 -07:00
Dan Willemsen dc068b0762 Stop calling `java -version`, remove HOST_JDK_IS_64BIT_VERSION
All users of this variable have been removed. This command was adding
50-175ms to `lunch` (~15-30%), and was running at least twice (serially)
in every build too.

Test: cs/HOST_JDK_IS_64BIT_VERSION
Test: prebuilts/jdk/jdk8/linux-x86/bin/java -version, is 64-bit.
Change-Id: Ifdd9663b010ec45918b29ac037849f49c8cd8f69
2017-07-26 10:49:04 -07:00
Tobias Thierer 1b53ea0908 Allow builds with costum toolchains.
Android bundles an OpenJDK-derived toolchain to avoid issues with
unsupported toolchains. For development / experiment purposes, this
CL the toolchain to be overridden via OVERRIDE_ANDROID_JAVA_HOME.

It is an error for OVERRIDE_ANDROID_JAVA_HOME to be set but not
point to a valid toolchain, but this error is not explicitly
checked for.

Bug: 38177295
Test: Treehugger

Change-Id: I72f641f560501e498f9c86a4380f19941fca11ad
2017-07-26 17:54:11 +01:00
Jiyong Park e5a78a2bdc Merge "Apks are again allowed to use vendor libs as before" am: 2aef19528e am: 9a4bd94594
am: 8846c69e26

Change-Id: I62e3101428f1bc18b08b6220512a4651f84d92e7
2017-07-26 01:00:51 +00:00
Jiyong Park 8846c69e26 Merge "Apks are again allowed to use vendor libs as before" am: 2aef19528e
am: 9a4bd94594

Change-Id: I83420882983214fd684cdad919940e8939651a48
2017-07-26 00:57:07 +00:00
Jiyong Park 9a4bd94594 Merge "Apks are again allowed to use vendor libs as before"
am: 2aef19528e

Change-Id: I8ae67b25877fa3fc9c600811863e04eee8fda990
2017-07-26 00:54:38 +00:00
Treehugger Robot 2aef19528e Merge "Apks are again allowed to use vendor libs as before" 2017-07-26 00:45:24 +00:00
Colin Cross 8a47bbc130 Merge "Enable ubsan check flag in build" am: 1907b9905e am: fe3c61839f
am: 5cbdaa4e09

Change-Id: I17cbe8fa6c0ab422bb30c2dab3e4e75386c0d2dc
2017-07-25 18:03:07 +00:00
Colin Cross 5cbdaa4e09 Merge "Enable ubsan check flag in build" am: 1907b9905e
am: fe3c61839f

Change-Id: I3a58609d21d730ce8a5bd5dfb66947c7f70a9526
2017-07-25 17:59:37 +00:00
Colin Cross fe3c61839f Merge "Enable ubsan check flag in build"
am: 1907b9905e

Change-Id: If116ca0f0493dfb4f96b95227169faa8efc99e6d
2017-07-25 17:56:07 +00:00
Colin Cross 1907b9905e Merge "Enable ubsan check flag in build" 2017-07-25 17:48:06 +00:00
Lucas Dupin 2c0743601e Merge "Removed overlay from target" into oc-dr1-dev
am: eb42aa7438

Change-Id: I2880faeab223755faeca64335b0eac8fe798ec80
2017-07-25 17:48:02 +00:00
TreeHugger Robot eb42aa7438 Merge "Removed overlay from target" into oc-dr1-dev 2017-07-25 17:40:03 +00:00
Colin Cross 5d68c8927c Merge "Make JAVA_HOME absolute inside build" am: 194893ee6c am: bac4bd6973
am: 80bd8e47f5

Change-Id: Iaa184464c93039f63805005d5447d39909b68fe3
2017-07-25 08:20:31 +00:00
Colin Cross 80bd8e47f5 Merge "Make JAVA_HOME absolute inside build" am: 194893ee6c
am: bac4bd6973

Change-Id: I7378f983558fd70d031631187805dfc453297102
2017-07-25 08:16:59 +00:00