Mark Salyzyn
5d9e6eb512
Merge "logcat: permit transition to Android.bp" am: 374f753211
...
am: 1830c9596d
Change-Id: I0fbe9bf8f12c10ce30fddc2e1a3ed9c66b21c6ce
2017-08-08 23:16:27 +00:00
Nan Zhang
26bd7be44c
Merge "Fix the typo: "desugar-classpath" to "desugar-bootclasspath"" am: 9758900b56
...
am: 4988fa2ffe
Change-Id: Ib2e1e87d23fa3ce87cb13ae90e79800c68c17365
2017-08-08 23:16:01 +00:00
Mark Salyzyn
1830c9596d
Merge "logcat: permit transition to Android.bp"
...
am: 374f753211
Change-Id: Ieeee905248faea638ed18831ba2168f2914f7d02
2017-08-08 23:10:03 +00:00
Nan Zhang
4988fa2ffe
Merge "Fix the typo: "desugar-classpath" to "desugar-bootclasspath""
...
am: 9758900b56
Change-Id: I72160219c0559e39b83df007f7c607cbed8db5a1
2017-08-08 23:09:24 +00:00
Treehugger Robot
374f753211
Merge "logcat: permit transition to Android.bp"
2017-08-08 23:06:25 +00:00
Treehugger Robot
9758900b56
Merge "Fix the typo: "desugar-classpath" to "desugar-bootclasspath""
2017-08-08 23:01:47 +00:00
Mark Salyzyn
719790f4d4
logcat: permit transition to Android.bp
...
Permit transition of logcat to Android.bp by moving the debug
target logpersist.start to the PRODUCT_PACKAGES_DEBUG list.
Test: compile
Change-Id: I6cfd4c40f848a2ff2661e3692fa8cd69ed99e8c9
2017-08-08 14:24:55 -07:00
Nan Zhang
f4571792f7
Fix the typo: "desugar-classpath" to "desugar-bootclasspath"
...
Test: runs "m -j checkbuild tests cts", and then --bootclasspath_entry
shows up in desugar command.
Change-Id: Ibcc8a3f51438723151c57f79e5a1184350efbd30
2017-08-08 13:38:59 -07:00
Dan Willemsen
6bd9ddc4cd
Merge "Fix the build when using findleaves.py" am: e1963e2511
...
am: d5a4802dd4
Change-Id: I4e39f5e4bb1251a0a9dced3b0dc56ecceafd9e62
2017-08-08 19:08:54 +00:00
Dan Willemsen
d5a4802dd4
Merge "Fix the build when using findleaves.py"
...
am: e1963e2511
Change-Id: I215d9b102f7f75201bffc9995314b28f3529d90a
2017-08-08 19:05:24 +00:00
Treehugger Robot
e1963e2511
Merge "Fix the build when using findleaves.py"
2017-08-08 19:00:51 +00:00
Dan Willemsen
34626e5386
Fix the build when using findleaves.py
...
This doesn't seem to affect the Kati emulation (at least on Linux), but
findleaves.py on both Mac and Linux checks for duplicate files (via
inode) and only emits build/{target,tools}/Android.mk instead of that
and build/make/{target,tools}/Android.mk.
Bug: 64397960
Test: build/tools/findleaves.py --prune=.git --prune=.repo --dir=. Android.mk
Test: m -j signapk
Change-Id: Ie6219a809e403e6cc9371b5c0370c7925a592a0d
2017-08-08 09:45:12 -07:00
Jeff Gaston
aed14c5515
Merge "Remove the need to find Android.mk files via directory symlinks" am: 6ab53d7211
...
am: 03e7e81837
Change-Id: Ib453be719ce27c3f354b1353e45939cee2102aea
2017-08-08 00:16:53 +00:00
Jeff Gaston
03e7e81837
Merge "Remove the need to find Android.mk files via directory symlinks"
...
am: 6ab53d7211
Change-Id: I0495d45001821d095531d5be7c049fc2836888f7
2017-08-08 00:14:51 +00:00
Jeff Gaston
6ab53d7211
Merge "Remove the need to find Android.mk files via directory symlinks"
2017-08-08 00:05:09 +00:00
Jeff Gaston
5c1f3fd068
Remove the need to find Android.mk files via directory symlinks
...
Bug: 64397960
Test: m -j
Change-Id: I5b77dd654dfced63900913c447b5448b632158d7
2017-08-07 14:21:20 -07:00
Jeff Hao
5b3e24484c
Merge "Add dirty-images-objects handling to boot image build." am: 5848fedea8
...
am: 3b16c4e7c7
Change-Id: I2786f4baa79a9842d91426a721cee80b1f039900
2017-08-05 01:13:40 +00:00
Jeff Hao
3b16c4e7c7
Merge "Add dirty-images-objects handling to boot image build."
...
am: 5848fedea8
Change-Id: Ida5683c28ed78db625a5383f52b81a087373ea75
2017-08-05 01:02:18 +00:00
Treehugger Robot
5848fedea8
Merge "Add dirty-images-objects handling to boot image build."
2017-08-05 00:55:48 +00:00
Colin Cross
77ac7ceef7
Merge "Revert "Revert "Copy resources from classes.jar when using AAPT2""" am: e2b98ace94
...
am: a4e638689b
Change-Id: I7d558d83c5cf6fcc251767299d0a98115b057b2f
2017-08-04 21:08:01 +00:00
Colin Cross
a4e638689b
Merge "Revert "Revert "Copy resources from classes.jar when using AAPT2"""
...
am: e2b98ace94
Change-Id: Id0850fff121beab0920e06440c7271d7622387b0
2017-08-04 21:02:35 +00:00
Treehugger Robot
e2b98ace94
Merge "Revert "Revert "Copy resources from classes.jar when using AAPT2"""
2017-08-04 20:44:15 +00:00
Colin Cross
303567c922
Revert "Revert "Copy resources from classes.jar when using AAPT2""
...
This reverts commit a7e336d17a
.
Reapplies I6649f7f2fbf63ff5001f4731e22960f857726c70 with fix
for jack builds.
Bug: 64272170
Test: https://android-build.googleplex.com/builds/view-workplan?viewType=Table&workplanId=L93000000088657848&nodeType=Trybot
Change-Id: Id66aebfc2c26a4467e6cf25e4372080882f0b286
Merged-In: Id66aebfc2c26a4467e6cf25e4372080882f0b286
(cherry picked from commit 6fedebf936
)
2017-08-04 09:35:13 -07:00
Calin Juravle
b96e433ba1
Merge "Replace -classpath with --class-loader-context for preopt" am: 1a7b46bf71
...
am: a0cf6dc2dc
Change-Id: I54f1b7faebb917c0dfdc0a22d9a1dbe97958260e
2017-08-03 21:15:08 +00:00
Calin Juravle
a0cf6dc2dc
Merge "Replace -classpath with --class-loader-context for preopt"
...
am: 1a7b46bf71
Change-Id: I978c17cb5ca92ad21a30d983ef42241dbff58944
2017-08-03 21:09:04 +00:00
Calin Juravle
1a7b46bf71
Merge "Replace -classpath with --class-loader-context for preopt"
2017-08-03 20:57:38 +00:00
Jeff Hao
b454ee195a
Add dirty-images-objects handling to boot image build.
...
Allows grouping of classes with dirty static fields to be grouped
together in the image to have fewer dirty pages.
(cherry-picked from commit 865d54caf2
)
Bug: 62554875
Test: mm test-art-host
Merged-In: I2486d2704d74a192f1ecdc02589e569b61efa4ae
Change-Id: I2486d2704d74a192f1ecdc02589e569b61efa4ae
2017-08-03 11:04:11 -07:00
Dmitry Shmidt
86acd08b1a
Merge "clang: Allow LOCAL_CLANG exception for device/google/contexthub project" am: 138c7baabe
...
am: 800604dc37
Change-Id: I4de90e11061fb75ecc69456fd005a18bded20175
2017-08-03 16:45:33 +00:00
Dmitry Shmidt
800604dc37
Merge "clang: Allow LOCAL_CLANG exception for device/google/contexthub project"
...
am: 138c7baabe
Change-Id: I5f821a275c744796f654242c05caeea44691f0e3
2017-08-03 16:39:37 +00:00
Treehugger Robot
138c7baabe
Merge "clang: Allow LOCAL_CLANG exception for device/google/contexthub project"
2017-08-03 16:31:57 +00:00
Dan Albert
373d682c69
Merge "Add PLATFORM_VERSION_FUTURE_CODENAMES." am: 577ff4730f
...
am: 5ebfa32c53
Change-Id: Ic4abaf6dc95b037858beb969b41b3b52bd057afb
2017-08-03 02:32:40 +00:00
Dan Albert
5ebfa32c53
Merge "Add PLATFORM_VERSION_FUTURE_CODENAMES."
...
am: 577ff4730f
Change-Id: Ib42278524d19d1a464b9357b78c5fd05e6736e04
2017-08-03 02:27:41 +00:00
Treehugger Robot
577ff4730f
Merge "Add PLATFORM_VERSION_FUTURE_CODENAMES."
2017-08-03 02:21:27 +00:00
Calin Juravle
965f8aec4c
Replace -classpath with --class-loader-context for preopt
...
Use --class-loader-context to pass the context to dex2oat instead of using
runtime arguments.
In preparation to simplify dex2oat handling of contexts.
Bug: 38138251
Test: make & check that the prebuilds have '&' as their classpath key
Change-Id: Iad2fc4364173f59f41886556222ec69f87a0bd52
2017-08-02 17:19:27 -07:00
Dan Albert
cd38b86016
Add PLATFORM_VERSION_FUTURE_CODENAMES.
...
PLATFORM_VERSION_ALL_CODENAMES isn't actually all the code names, just
the ones active in our current target. We need the list of all targets
so we can validate code names in NDK stub templates even if they're in
the future. Unfortunately, all_codenames has been baked into
build.prop for ages, so we're stuck with this name. Improve the
comments and add PLATFORM_VERSION_FUTURE_CODENAMES to cover to cover
the future targets.
Test: make checkbuild
Test: check $ANDROID_PRODUCT_OUT/system/build.prop
Bug: None
Change-Id: I81fed6f761e5362ef3050be9d1e3fb17739feadd
2017-08-02 17:17:41 -07:00
Colin Cross
6694b40a60
Merge "Clean jack intermediates" am: cf021094f1
...
am: 2783065c0b
Change-Id: Iaee1c03ddb366bdd2f19f55786ad2b840477e2fa
2017-08-02 17:18:31 +00:00
Colin Cross
2783065c0b
Merge "Clean jack intermediates"
...
am: cf021094f1
Change-Id: I1808fc66070231bb9340ef5e6d3f488d7c06da09
2017-08-02 17:14:44 +00:00
Colin Cross
cf021094f1
Merge "Clean jack intermediates"
2017-08-02 17:02:03 +00:00
Yifan Hong
7f27c8ec0e
Merge "Vendor modules in make also have __ANDROID_VNDK__ defined." am: 9bd6605abe
...
am: 6dc0978c5f
Change-Id: I29534fa2a6a96ab3b8cd63306f1d571eb50b1efc
2017-08-02 03:49:44 +00:00
Yifan Hong
6dc0978c5f
Merge "Vendor modules in make also have __ANDROID_VNDK__ defined."
...
am: 9bd6605abe
Change-Id: I7b6fc17cdd244ba6c6a266e0a0951b3a573119c5
2017-08-02 03:45:15 +00:00
Treehugger Robot
9bd6605abe
Merge "Vendor modules in make also have __ANDROID_VNDK__ defined."
2017-08-02 03:39:33 +00:00
Yifan Hong
d7aa8417de
Vendor modules in make also have __ANDROID_VNDK__ defined.
...
Bug: 64277220
Test: BOARD_VNDK_VERSION m -j
Change-Id: Ia9811ea526d0878b539c8c3da9e82e6bf33fe8e8
Merged-In: Ia9811ea526d0878b539c8c3da9e82e6bf33fe8e8
2017-08-01 18:54:10 -07:00
Bo Hu
1b86b7581c
Merge "Revert "Revert "emulator: create qemu images for system,vendor""" am: 5af2027e34
...
am: abd33cdba6
Change-Id: I4ec03f912aa03156114859432f4331f50b5d60b2
2017-08-01 23:26:17 +00:00
Bo Hu
abd33cdba6
Merge "Revert "Revert "emulator: create qemu images for system,vendor"""
...
am: 5af2027e34
Change-Id: I61b9598d6b69d74a42ad0dc445c866e3034ff638
2017-08-01 23:22:17 +00:00
Treehugger Robot
5af2027e34
Merge "Revert "Revert "emulator: create qemu images for system,vendor"""
2017-08-01 23:16:25 +00:00
Alexey Polyudov
1101804ca8
Merge "build: aux: Fix link type checking for AUX builds" am: 1e8c34b95f
...
am: 7ed81ccadd
Change-Id: I5bc90d165be0da81f7c48b66826795e74e2f5901
2017-08-01 23:14:47 +00:00
Alexey Polyudov
7ed81ccadd
Merge "build: aux: Fix link type checking for AUX builds"
...
am: 1e8c34b95f
Change-Id: Icc2581867c1adad52b29d3ca7c68f08c89a906c0
2017-08-01 22:57:52 +00:00
Dmitry Shmidt
795bed9329
clang: Allow LOCAL_CLANG exception for device/google/contexthub project
...
It is built by non-eabi gcc
Bug: 35666637
Test: Manual
Change-Id: I10b4364b66f6cad907b1271250506500aeb11fd5
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com >
2017-08-01 15:48:03 -07:00
Alexey Polyudov
1e8c34b95f
Merge "build: aux: Fix link type checking for AUX builds"
2017-08-01 22:46:20 +00:00
Alexey Polyudov
55ebe631b4
build: aux: Fix link type checking for AUX builds
...
AUX build environent is volatile and is only instantiated in
a context of AUX-aware module.
link-type checking is happening outside such context, and
is not able to correctly determine AUX build dependencies.
1. Save enough of context in LINK_TYPE variable;
Use AUX-<variant-name> instead of AUX
2. Load correct set of AUX meta build vars before
building link_type rules
Bug: 62060489
Test: make auxiliary
build no longer tries to access "/STATIC_LIBRARIES" path
Change-Id: I9764d4a0740da1c55a6f8429398872fc4362942c
2017-08-01 13:37:35 -07:00