Commit Graph

41884 Commits

Author SHA1 Message Date
Colin Cross
426ecd0f60 Merge "Replace build/tools with build/make/tools" am: 973301af79 am: e6dc6b2026
am: eb6c8444a6

Change-Id: I14d033658d219e81790ab1e730b7e477c70f4a13
2017-12-13 03:03:47 +00:00
Justin Yun
1a029f0da2 Merge "Define PLATFORM_VNDK_VERSION" am: 553de17d44 am: db00ea991d
am: ea0752140f

Change-Id: Ib0ecca7c0b324e65e8a9312423eef4deb2a6b3f5
2017-12-13 02:59:41 +00:00
Alan Leung
815e6cf64a Merge "Avoid feeding D8 with dex files." am: c0eabe6d34 am: 6bba1f1ca2
am: dae5371f64

Change-Id: I7dc3b44fb872a1901739f2bb342d0ef86d11bff1
2017-12-13 02:58:23 +00:00
Colin Cross
eb6c8444a6 Merge "Replace build/tools with build/make/tools" am: 973301af79
am: e6dc6b2026

Change-Id: Ie3eb9e2b411603f95f91cac79ebe56eb78423da3
2017-12-13 02:49:40 +00:00
Colin Cross
e6dc6b2026 Merge "Replace build/tools with build/make/tools"
am: 973301af79

Change-Id: I3303c4c8883b76bb2b687e07a8c1834811caf5a4
2017-12-13 02:42:37 +00:00
Justin Yun
ea0752140f Merge "Define PLATFORM_VNDK_VERSION" am: 553de17d44
am: db00ea991d

Change-Id: I351f15cc9ab934a9da95b24acb8e80410c5e93d2
2017-12-13 02:35:23 +00:00
Treehugger Robot
973301af79 Merge "Replace build/tools with build/make/tools" 2017-12-13 02:34:42 +00:00
Alan Leung
dae5371f64 Merge "Avoid feeding D8 with dex files." am: c0eabe6d34
am: 6bba1f1ca2

Change-Id: Iac7057b19c71e0330a8f03b8f235a33ef1416651
2017-12-13 02:34:15 +00:00
Justin Yun
db00ea991d Merge "Define PLATFORM_VNDK_VERSION"
am: 553de17d44

Change-Id: Ieeb576473577a712d94bfd4fe8af98251003be4c
2017-12-13 02:03:09 +00:00
Alan Leung
6bba1f1ca2 Merge "Avoid feeding D8 with dex files."
am: c0eabe6d34

Change-Id: I4c22efe2b6766341fef64be151ef6f4a944a2cb8
2017-12-13 02:01:56 +00:00
Treehugger Robot
553de17d44 Merge "Define PLATFORM_VNDK_VERSION" 2017-12-13 01:49:41 +00:00
Justin Yun
2a233b3b86 Define PLATFORM_VNDK_VERSION
PLATFORM_VNDK_VERSION means the VNDK version that current build
provides. This value will be set to PLATFORM_SDK_VERSION once the
version is release. Otherwise, it will be set to "current".

Bug: 69883025
Test: device boot
Change-Id: I3fde4943aa062d9d148a3d7fc2798948870a48c6
2017-12-13 10:48:34 +09:00
Treehugger Robot
c0eabe6d34 Merge "Avoid feeding D8 with dex files." 2017-12-13 01:29:40 +00:00
Colin Cross
4b35d85171 Merge "Add soong_docs to droidcore" am: f027511929 am: 5d8b68daca
am: c95bf7aa1d

Change-Id: I29605a4a69d27662e886b4b04754ac28b579db42
2017-12-13 00:10:38 +00:00
Colin Cross
c95bf7aa1d Merge "Add soong_docs to droidcore" am: f027511929
am: 5d8b68daca

Change-Id: Idac784ec8ef50063faa3d772b9b52beebd7a3b3a
2017-12-13 00:00:22 +00:00
Alan Leung
aff156bd49 Avoid feeding D8 with dex files.
Some test targets include dex files as resource to be loaded
at runtime. This is an issue since full D8 also take dex files
as input.

This CL extracts only the class files and feed that to D8 instead
of the whole jar.

Test: USE_D8_DESUGAR=true m checkbuild tests
Bug: 69329508

Change-Id: I52d80ec01933573f18eb497472a80b6a649c9dae
2017-12-12 15:51:25 -08:00
Colin Cross
5d8b68daca Merge "Add soong_docs to droidcore"
am: f027511929

Change-Id: I353b59cfbd7bf86eac0b999f86cb32f9193e3a68
2017-12-12 23:43:25 +00:00
Colin Cross
f027511929 Merge "Add soong_docs to droidcore" 2017-12-12 23:02:55 +00:00
Colin Cross
2c1da1e95f Add soong_docs to droidcore
Bug: 70516282
Test: treehugger
Change-Id: I818ad6f948502f4beb0205b583687c1d9fa563ac
2017-12-12 11:11:48 -08:00
SzuWei Lin
49cb5d3ea4 Merge changes I8f20db07,Id3a8dd20,I0275a5d4 am: 6553fd6cad am: 90cb321f88
am: 7494beccb3  -s ours

Change-Id: I5c7ed4ba88d186f579da8204188356b4361ee135
2017-12-12 05:07:05 +00:00
SzuWei Lin
7494beccb3 Merge changes I8f20db07,Id3a8dd20,I0275a5d4 am: 6553fd6cad
am: 90cb321f88

Change-Id: I6df8c64d5fb0176b09e77eed0f90f569586814d5
2017-12-12 05:02:32 +00:00
SzuWei Lin
90cb321f88 Merge changes I8f20db07,Id3a8dd20,I0275a5d4
am: 6553fd6cad

Change-Id: I1e54f781f0ea3929200ecb3505ec71cb0ad30b99
2017-12-12 04:57:44 +00:00
Treehugger Robot
6553fd6cad Merge changes I8f20db07,Id3a8dd20,I0275a5d4
* changes:
  Enable VNDK runtime checking
  Add vintf into GSI
  Add a default apn-conf.xml into GSI
2017-12-12 04:50:26 +00:00
Isaac Chen
573a3275d6 Merge "Enable VNDK for aosp_x86 and aosp_x86_64" am: 966e080ade am: d3d7c2e180
am: 18c29a2ffb  -s ours

Change-Id: Ic0ed6bfc21baa44c10e176de0582c6368461d63a
2017-12-12 04:45:19 +00:00
Isaac Chen
18c29a2ffb Merge "Enable VNDK for aosp_x86 and aosp_x86_64" am: 966e080ade
am: d3d7c2e180

Change-Id: I6699688bda4ed7d7b057c7a423c8622dc5065309
2017-12-12 04:35:15 +00:00
Isaac Chen
d3d7c2e180 Merge "Enable VNDK for aosp_x86 and aosp_x86_64"
am: 966e080ade

Change-Id: Id8164d72b1aedd6521645df09e7ba9bb541f1c48
2017-12-12 04:22:57 +00:00
Isaac Chen
966e080ade Merge "Enable VNDK for aosp_x86 and aosp_x86_64" 2017-12-12 04:13:04 +00:00
Alan Leung
e8f23f11e9 Merge "Add USE_D8_DESUGAR option in build/core" am: 78b99fefd3 am: c2847897ff
am: 8de45264f6

Change-Id: I7fedd53bd581c3ed221aea1c7ce8b1d337bd003a
2017-12-12 00:24:40 +00:00
Simran Basi
6b6e4964f5 Merge "base_rules.mk: Copy LOCAL_TEST_DATA to testcase folders." am: 9098fd8905 am: d78d01deec
am: 4a69393749

Change-Id: Ibd4d51414827385e0b2e18505c575ca25fee6da5
2017-12-12 00:23:35 +00:00
Alan Leung
8de45264f6 Merge "Add USE_D8_DESUGAR option in build/core" am: 78b99fefd3
am: c2847897ff

Change-Id: Ibf1d288038c32866db2b1821718f1915e0a43905
2017-12-12 00:15:21 +00:00
Alan Leung
c2847897ff Merge "Add USE_D8_DESUGAR option in build/core"
am: 78b99fefd3

Change-Id: I9a81702a827231b731e0c7b3938092c43b3a01d5
2017-12-12 00:10:49 +00:00
Treehugger Robot
78b99fefd3 Merge "Add USE_D8_DESUGAR option in build/core" 2017-12-12 00:06:18 +00:00
Simran Basi
4a69393749 Merge "base_rules.mk: Copy LOCAL_TEST_DATA to testcase folders." am: 9098fd8905
am: d78d01deec

Change-Id: Ib7b39cfb570f093dac9c24637856b1542f403437
2017-12-12 00:05:15 +00:00
TreeHugger Robot
c8591c04f7 Merge "Add org.chromium.arc to package_whitelist.txt" 2017-12-12 00:03:58 +00:00
Simran Basi
d78d01deec Merge "base_rules.mk: Copy LOCAL_TEST_DATA to testcase folders."
am: 9098fd8905

Change-Id: Ie50dab529ba5cc4c8ad86eec8fca5a0358b2846c
2017-12-12 00:00:19 +00:00
Treehugger Robot
9098fd8905 Merge "base_rules.mk: Copy LOCAL_TEST_DATA to testcase folders." 2017-12-11 23:51:06 +00:00
Tobias Thierer
e8c8b574b2 Merge "Revert "Build with OpenJDK 9 -target 1.8 by default except for errorprone."" am: 909a2d96f2 am: fe1280f4e0
am: 5d214a3844

Change-Id: I08099b9355ceeec2e66bb6d5bfdd3f2198b20aa5
2017-12-11 23:17:57 +00:00
Tobias Thierer
5d214a3844 Merge "Revert "Build with OpenJDK 9 -target 1.8 by default except for errorprone."" am: 909a2d96f2
am: fe1280f4e0

Change-Id: I457bc81cedf5d97148dd1abc2c0f8d2766be05c4
2017-12-11 23:11:44 +00:00
Tobias Thierer
fe1280f4e0 Merge "Revert "Build with OpenJDK 9 -target 1.8 by default except for errorprone.""
am: 909a2d96f2

Change-Id: Ie957ad6645320da76c0a6e637dd66aa423f21827
2017-12-11 23:06:07 +00:00
Tobias Thierer
909a2d96f2 Merge "Revert "Build with OpenJDK 9 -target 1.8 by default except for errorprone."" 2017-12-11 22:57:51 +00:00
TreeHugger Robot
ac50fd1770 Merge "[DO NOT MERGE] Update security string to 2018-02-05 Bug 70487538" 2017-12-11 22:16:26 +00:00
Alan Leung
eaafb3cd37 Add USE_D8_DESUGAR option in build/core
Add an option to use D8's desugar instead of the standalone version.

USE_D8_DESUGAR=true m would trigger DCHECK in dex2oat unless
https://android-review.googlesource.com/c/platform/art/+/562595 is
patched in as well.

Bug: 69329508
Test: m && USE_D8_DESUGAR=false m

Change-Id: I601dada44c361e45bbc0e2227ae1544a7d9efa90
2017-12-11 14:03:09 -08:00
Ricardo Quesada
2dcb2362d7 Add org.chromium.arc to package_whitelist.txt
Add org.chromium.arc to package_whitelist.txt
This is needed from the org.chromium.arc EventLogTags file.

Bug: 70513529
Test: compiled on marlin. did not generate any conflict. marlin worked
      Ok

Change-Id: Ia4b0133f66677f988916457ab4b6c9332342a01b
2017-12-11 22:02:48 +00:00
Dan Shi
5274f19156 Merge "Create an artifact to include TEST_MAPPING files in source code" am: 9874428159 am: 3981526a34
am: 2ac0a5d472

Change-Id: Ic0e5a5482f239be073bd0f34579fd5c9ed032cbc
2017-12-11 21:02:31 +00:00
Dan Shi
2ac0a5d472 Merge "Create an artifact to include TEST_MAPPING files in source code" am: 9874428159
am: 3981526a34

Change-Id: I6433f33ccc6b21ba184321249303c05d4cbd2d1d
2017-12-11 20:57:55 +00:00
Dan Shi
3981526a34 Merge "Create an artifact to include TEST_MAPPING files in source code"
am: 9874428159

Change-Id: I67f2132460e7134f7df35c06dc80bf743b531a11
2017-12-11 20:51:53 +00:00
Treehugger Robot
9874428159 Merge "Create an artifact to include TEST_MAPPING files in source code" 2017-12-11 20:42:46 +00:00
Tobias Thierer
6de04b723d Merge "Build with OpenJDK 9 -target 1.8 by default except for errorprone." am: 3342e45722 am: 1c64b02a4d
am: 6bfcac877e

Change-Id: Ida8e40a9a0bf922891d404cdc5e2a92ed3d981e5
2017-12-11 19:29:25 +00:00
Tobias Thierer
6bfcac877e Merge "Build with OpenJDK 9 -target 1.8 by default except for errorprone." am: 3342e45722
am: 1c64b02a4d

Change-Id: Ieef89169d6eb521823643f8bffb2815b6d0a35a2
2017-12-11 19:23:49 +00:00
Tobias Thierer
1c64b02a4d Merge "Build with OpenJDK 9 -target 1.8 by default except for errorprone."
am: 3342e45722

Change-Id: Iedf41adf5cf04614a1bcb27eea5e2e3cb61c96b9
2017-12-11 19:17:41 +00:00