Commit Graph

38788 Commits

Author SHA1 Message Date
Jeff Gaston 5b767956fd Merge "Remove the need to find Android.mk files via directory symlinks" am: 6ab53d7211 am: 03e7e81837
am: aed14c5515

Change-Id: I84c8258ebb89eff647cdd52663f812c5600145e1
2017-08-08 00:19:21 +00: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 7e6899ac53 Merge "Add dirty-images-objects handling to boot image build." am: 5848fedea8 am: 3b16c4e7c7
am: 5b3e24484c

Change-Id: I18365f7c17ccb0b2e90dd4ecfbddaeb5843bcfde
2017-08-05 01:20:34 +00: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 27e0e4b27a Merge "Revert "Revert "Copy resources from classes.jar when using AAPT2""" am: e2b98ace94 am: a4e638689b
am: 77ac7ceef7

Change-Id: I2ddc709d9c9a98f266d0f879879fdb1480ed5db6
2017-08-04 21:14:33 +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
Bart Sears 7ff34f130a Merge "Change Android version to v8.0.0" into oc-dr1-dev
am: 1e91b2229b  -s ours

Change-Id: I043ae8b639ea719e28c4ef69293ecd3963a5c53a
2017-08-04 02:56:33 +00:00
Bart Sears 1e91b2229b Merge "Change Android version to v8.0.0" into oc-dr1-dev 2017-08-04 02:50:52 +00:00
Bart Sears a302746d9b Change Android version to v8.0.0
Change PLATFORM_VERSION.OPD1 to v8.0.0.  This is a temporary
change until we get a new KeyMaster that can handle going from
8.0.1 -> 8.0.0.  At that point we will change PLATFORM_VERSION
to 8.0.0.

Test: Check: Settings > System > About phone > Android version.
Also verified that update from 8.0.1 to v8.0.0 works (i.e. device
boots and shows new Android Version).
Bug: 64130669
Merged-In: I7894321971c0b696594deb064ebed3f43cf7c8d1
Change-Id: Ibb8fbb123a74196f57f649d0c22f58beefaf6d06
2017-08-03 16:23:59 -07:00
Calin Juravle ca79eec29e Merge "Replace -classpath with --class-loader-context for preopt" am: 1a7b46bf71 am: a0cf6dc2dc
am: b96e433ba1

Change-Id: I3c0d6191daee33ff0e4a5f6a6e15a5c4ba594962
2017-08-03 21:25:12 +00: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 55a388d092 Merge "clang: Allow LOCAL_CLANG exception for device/google/contexthub project" am: 138c7baabe am: 800604dc37
am: 86acd08b1a

Change-Id: I3daad22a5f154b212144938a109acfb809a10a81
2017-08-03 16:51:03 +00: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 3626b53135 Merge "Add PLATFORM_VERSION_FUTURE_CODENAMES." am: 577ff4730f am: 5ebfa32c53
am: 373d682c69

Change-Id: I28413287340f0206ecea05896da74cce815e7d1f
2017-08-03 02:37:40 +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 f4bac33ef3 Merge "Clean jack intermediates" am: cf021094f1 am: 2783065c0b
am: 6694b40a60

Change-Id: Iec4e86d7c559e03c5f803f0f9bc38bade45b2355
2017-08-02 17:22:31 +00: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 64ba249f43 Merge "Vendor modules in make also have __ANDROID_VNDK__ defined." am: 9bd6605abe am: 6dc0978c5f
am: 7f27c8ec0e

Change-Id: I4e72d20d2fc17cd9b125637672b27eb630978e31
2017-08-02 03:54:47 +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 d80d922083 Merge "Revert "Revert "emulator: create qemu images for system,vendor""" am: 5af2027e34 am: abd33cdba6
am: 1b86b7581c

Change-Id: I0c8bf4c8db0cb783c7116d2f9d0734b98341401a
2017-08-01 23:30:23 +00: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
Alexey Polyudov f53b7b79c4 Merge "build: aux: Fix link type checking for AUX builds" am: 1e8c34b95f am: 7ed81ccadd
am: 1101804ca8

Change-Id: Ifb15bb2bdf5441e4e67f3009b956516b8c4a5b1d
2017-08-01 23:18:59 +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