Commit graph

38185 commits

Author SHA1 Message Date
Colin Cross
4954077f5e Merge "Compile with javac by default"
am: 6ce5a428ae

Change-Id: I4775ccd536a58c5da581a7fb2b1b582f286fc6b2
2017-08-01 18:32:47 +00:00
Colin Cross
6ce5a428ae Merge "Compile with javac by default" 2017-08-01 18:24:12 +00:00
Bo Hu
471e2ba1d6 Merge "Revert "emulator: create qemu images for system,vendor"" am: a2ea9626e5
am: b7e5cf8b6d

Change-Id: I2929dae53386a287864d3166d707bfe9137a7803
2017-08-01 07:03:36 +00:00
Bo Hu
b7e5cf8b6d Merge "Revert "emulator: create qemu images for system,vendor""
am: a2ea9626e5

Change-Id: I0118d5355aa3ffcd728b22e964609f02561df2db
2017-08-01 07:00:06 +00:00
Bo Hu
a2ea9626e5 Merge "Revert "emulator: create qemu images for system,vendor"" 2017-08-01 06:52:44 +00:00
Bo Hu
9b99ddc8a5 Revert "emulator: create qemu images for system,vendor"
This reverts commit b5d0503758.

Change-Id: Ie46a3a3dd99dec42673b3e3bd5b9085ca0480a8d
2017-08-01 06:50:07 +00:00
Colin Cross
3f7ab5f080 Merge "Fix test suite zip generation on mac" am: 94be321cae
am: c1ed882bd8

Change-Id: I5c4295c75461870fdddfabd153fb73fcff67ffa7
2017-08-01 04:04:37 +00:00
Colin Cross
c1ed882bd8 Merge "Fix test suite zip generation on mac"
am: 94be321cae

Change-Id: Ied0e6233854db55e76498da2ca239ca6773ce59f
2017-08-01 04:01:37 +00:00
Treehugger Robot
94be321cae Merge "Fix test suite zip generation on mac" 2017-08-01 03:51:28 +00:00
bohu
fe3b305516 Merge "emulator: create qemu images for system,vendor" am: 571e5d47b7
am: dbbd3311ae

Change-Id: I00b15a3ab05ce7d64fad7e9700169fd67ae699fb
2017-08-01 01:58:40 +00:00
bohu
dbbd3311ae Merge "emulator: create qemu images for system,vendor"
am: 571e5d47b7

Change-Id: Id80d452017384769146879bec205f39da79e37ae
2017-08-01 01:56:12 +00:00
Colin Cross
f3a4340435 Fix test suite zip generation on mac
Don't use sed -i, it requires an argument on mac and is eating the
-e parameter, which causes the command to not be applied.

Also clean up the temporary list files so they don't clutter up
$OUT.

Test: m -j device-tests
Bug: 64226094
Change-Id: Ie71820fc2d1cd812717bf0c156af011ca723e9f6
2017-08-01 01:51:30 +00:00
Treehugger Robot
571e5d47b7 Merge "emulator: create qemu images for system,vendor" 2017-08-01 01:49:39 +00:00
bohu
b5d0503758 emulator: create qemu images for system,vendor
For raw system.img and vendor.img do not have
partition table and init refuses to mount them
in first stage mounting.

For emulator build:
create partitioned system-qemu.img for system.img;
create partitioned vendor-qemu.img for vendor.img
if applicable.

Change-Id: I64fdcdafc303cf2f74a1e96653e7afe259f0af98
2017-07-31 16:28:40 -07:00
Dan Willemsen
4a1a1fc21d Merge "Continue using the real make if -C is used" am: 218a0c0c70
am: 56a2bb9ec9

Change-Id: Idd579c83cc58ed2ead8d327d3f6afaaf710c9a1e
2017-07-29 08:21:52 +00:00
Dan Willemsen
56a2bb9ec9 Merge "Continue using the real make if -C is used"
am: 218a0c0c70

Change-Id: I8239d2bbf96fd9d2d99a05592ce4770e18ac4187
2017-07-29 08:18:52 +00:00
Treehugger Robot
218a0c0c70 Merge "Continue using the real make if -C is used" 2017-07-29 08:11:32 +00:00
Mathieu Chartier
d145121128 Merge changes Ic89cc4c0,I189cd144,Id51726ae,I8b777c88,Ia4573464, ... am: dce396a70f
am: 954551bb24

Change-Id: If483905685d107ca2e52826d8792f9640319aea9
2017-07-29 00:11:49 +00:00
Mathieu Chartier
954551bb24 Merge changes Ic89cc4c0,I189cd144,Id51726ae,I8b777c88,Ia4573464, ...
am: dce396a70f

Change-Id: Id0d0ec4bc219b8fc0ce8b7bd13868d236b865153
2017-07-29 00:07:32 +00:00
Treehugger Robot
dce396a70f Merge changes Ic89cc4c0,I189cd144,Id51726ae,I8b777c88,Ia4573464, ...
* changes:
  Add support for using profiles for boot images
  Add PRODUCT_SYSTEM_SERVER_DEBUG_INFO property
  Add product system server compiler filter property
  Allow custom compiler filters for system server jars
  Install preopted profiles on device
  Default profile usage based on the existence of the profile
  Use speed-profile instead of quicken for the profile case
2017-07-29 00:01:09 +00:00
Dan Willemsen
e984224899 Continue using the real make if -C is used
To allow building other make-based systems from the top of the android
tree.

Bug: 64145979
Test: get_make_command
Test: get_make_command -C
Test: get_make_command -C.
Test: get_make_command -C .
Test: get_make_command -j test
Test: get_make_command test-C
Test: get_make_command " -C"
Test: make
Test: make -C.
Change-Id: I406dd2706f19e5d2a6afdff441335f4e01ba6d12
2017-07-28 21:08:12 +00:00
Colin Cross
75b50421af Compile with javac by default
javac is replacing jack as the default compiler for platform builds.
Leave it on for unbundled builds, we don't have a solution for lambdas
in unbundled builds yet (b/62038127).

Temporarily allow products to continue to default to jack by setting
PRODUCT_COMPILE_WITH_JACK=true.

This reapplies I1c3857f64eafa445ad1b9dd94eff85bef05f4649.

Bug: 36902714
Test: m -j checkbuild
Test: https://android-build.googleplex.com/builds/view-workplan?viewType=Table&workplanId=L50600000086240009&nodeType=Trybot
Test: https://android-build.googleplex.com/builds/view-workplan?viewType=Table&workplanId=L68900000086676531&nodeType=Trybot
Test: https://android-build.googleplex.com/builds/view-workplan?viewType=Table&workplanId=L37200000086753998&nodeType=Trybot
Test: https://android-build.googleplex.com/builds/view-workplan?viewType=Table&workplanId=L74600000087054271&nodeType=Trybot
Test: sailfish-userdebug boots and basic interactions work
Test: art tests pass
Test: libcore tests pass
Change-Id: Icd1b549cd8a010758a6e5d98b39569fcd1825f60
2017-07-28 13:01:32 -07:00
Mathieu Chartier
a61acf62c9 Add support for using profiles for boot images
Added two product flags:
PRODUCT_USE_PROFILE_FOR_BOOT_IMAGE
PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION

If PRODUCT_USE_PROFILE_FOR_BOOT_IMAGE is enabled (default false), a
art profile is used to create the preopted boot image. This profile
is also passed to the runtime in AndroidRuntime.cpp.

The profile is created from the
PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION variable that defaults
to "frameworks/base/boot-image-profile.txt".

(cherry picked from commit 77226f6333)

Bug: 37966211
Test: make and flash

Merged-In: Ic89cc4c0c4d39aa9726843f5d9c2fb1dedeb7885
Change-Id: Ic89cc4c0c4d39aa9726843f5d9c2fb1dedeb7885
2017-07-28 11:17:32 -07:00
Mathieu Chartier
f0db908ea7 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 11:17:24 -07:00
Mathieu Chartier
6228ec2d07 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 11:17:17 -07:00
Mathieu Chartier
abcf66b538 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 11:17:09 -07:00
Mathieu Chartier
98f44b7f20 Install preopted profiles on device
They are stored in /system/etc/profiles/, these will be copied to
the over the data profiles during fist boot. This means is required
to avoid missing JIT samples for the preopt compiled methods.

(cherry picked from commit 44c9c076d3)

Bug: 38032017

Test: make and flash
Test: adb shell ls -l /system/etc/profiles/

Merged-In: Ia4573464ac39c4720e0d9e8a29b8ea4213bd9d78
Change-Id: Ia4573464ac39c4720e0d9e8a29b8ea4213bd9d78
2017-07-28 11:17:00 -07:00
Mathieu Chartier
fcc8d8b26d Default profile usage based on the existence of the profile
Currently this only checks vendor/google_data/art_profile, but the plan
is to use a per product directory in the near future.

(cherry picked from commit 6324c2d291)

Bug: 38032017
Test: make and make sure the profile was used (calculator).

Merged-In: I8de6484dbcac5fc040ad70f97e97d193b317af8c
Change-Id: I8de6484dbcac5fc040ad70f97e97d193b317af8c
2017-07-28 11:16:53 -07:00
Mathieu Chartier
229d0534dc Use speed-profile instead of quicken for the profile case
Reduces calculator launch from 354 -> 325 with a profile.

(cherry picked from commit c5536ffbd3)

Bug: 38032017

Test: mm

Merged-In: I795a2d3f4db5546be4d77c3716e69d20d8f23549
Change-Id: I795a2d3f4db5546be4d77c3716e69d20d8f23549
2017-07-28 11:16:43 -07: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
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
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
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