Commit graph

528 commits

Author SHA1 Message Date
Ian Rogers
296fb4c77c am 93efec89: Merge "Pass instruction set variant to dex2oat."
* commit '93efec89e067c5fe6f4585a5f0f033826310ee76':
  Pass instruction set variant to dex2oat.
2014-11-14 00:34:24 +00:00
Ian Rogers
a18a28305d Pass instruction set variant to dex2oat.
Also, add it to the ANDROID_BUILD_PROPERTIES.
Remove non-default instruction set features.
Bug: 18056890

Change-Id: I9169cdfecbb176f62b941852948222edc3f511fd
2014-11-08 17:07:23 -08:00
Ian Rogers
4606ae776b am b78348d5: am 5968de73: Merge "Remove stale dexopt flags."
* commit 'b78348d5b49ab2899b414d5700f0d7e6e797dfc6':
  Remove stale dexopt flags.
2014-11-06 00:12:02 +00:00
Ian Rogers
b78348d5b4 am 5968de73: Merge "Remove stale dexopt flags."
* commit '5968de73fb78e2ca8f32ab0588cac92f74a0435e':
  Remove stale dexopt flags.
2014-11-06 00:05:36 +00:00
Ian Rogers
9c7fc4b325 Remove stale dexopt flags.
Change-Id: Ib58d39012eabd5f854b9434ab922340fcfe43b57
2014-11-05 14:53:53 -08:00
Neil Fuller
4b642748dd am acd65c7d: am 97ef1d46: Merge "Add OpenJDK 8 experimental support"
* commit 'acd65c7db0212bff2b7b1878a26b7a105522cd44':
  Add OpenJDK 8 experimental support
2014-10-29 17:11:52 +00:00
Neil Fuller
c5c60e2c2a am f7ce9508: am 4dfda1fa: Merge "Remove Java 6 build support"
* commit 'f7ce9508dec85c67d3a2ebe84db073a01355eba5':
  Remove Java 6 build support
2014-10-29 17:11:24 +00:00
Neil Fuller
acd65c7db0 am 97ef1d46: Merge "Add OpenJDK 8 experimental support"
* commit '97ef1d46cdae3776e49900b2ed92748f6127bbb0':
  Add OpenJDK 8 experimental support
2014-10-28 04:50:49 +00:00
Ying Wang
83cd45517d Store symbols.zip in apps_only build. automerge: a60fb49
automerge: a73b611

* commit 'a73b611e6b2a626b144170f15509e02f3318976e':
  Store symbols.zip in apps_only build.
2014-10-28 03:36:22 +00:00
Ying Wang
a60fb49704 Store symbols.zip in apps_only build.
Bug: 18103055
Change-Id: I0eb335e944138b0edc3050d19c076891f499a07c
2014-10-27 17:57:11 +00:00
Neil Fuller
f7ce9508de am 4dfda1fa: Merge "Remove Java 6 build support"
* commit '4dfda1fa4201e41022396b77054168ffc73b590c':
  Remove Java 6 build support
2014-10-24 20:18:15 +00:00
Neil Fuller
960f22c11d Add OpenJDK 8 experimental support
Targeting 1.7: just adding support for the tools.

Various issues exist with OpenJDK 8: it doesn't build to completion
yet.

Change-Id: I54942f497264234e4bef488c8d17d243b4ef2f14
2014-10-23 14:07:29 +01:00
Neil Fuller
46e00ea4ba Remove Java 6 build support
Change-Id: I9754844af58e3f81d7eb9dae286128d17a2cb56c
2014-10-22 10:53:59 +01:00
Andreas Gampe
ec70fdaa35 am d8a89a88: am c776f063: Merge "Build: Do not set interpreted mode for SDK build" into lmp-dev
* commit 'd8a89a8847897dd3c0a2b05dcc09c6f3ccc44c8f':
  Build: Do not set interpreted mode for SDK build
2014-10-04 15:45:06 +00:00
Andreas Gampe
783e667b2a am c776f063: Merge "Build: Do not set interpreted mode for SDK build" into lmp-dev
* commit 'c776f06379929f1e1b9d1f4bb0749faf36e19670':
  Build: Do not set interpreted mode for SDK build
2014-10-03 22:25:17 +00:00
Andreas Gampe
2abc44c2fe Build: Do not set interpreted mode for SDK build
In case of emulator images created for an sdk build (sdk, win_sdk,
sdk_addon), do not set dex2oat to compile apps interpret-only.

Bug: 17796919

Change-Id: I6961aa20fd3b6ea164a1f55321387e84c8983550
2014-10-03 13:46:24 -07:00
Brian Carlstrom
4d0595b596 am 8c444b61: am b97b1e59: Merge "Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug"
* commit '8c444b61b3d3fab99f9bd617a8d7705c81e8da7a':
  Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug
2014-09-19 22:01:46 +00:00
Brian Carlstrom
da51aa7a13 am 8c444b61: am b97b1e59: Merge "Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug"
* commit '8c444b61b3d3fab99f9bd617a8d7705c81e8da7a':
  Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug
2014-09-19 22:01:42 +00:00
Brian Carlstrom
85d56eba99 Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug
Bug: 17572009
Change-Id: I0cfc1aa2dd93a8dac21d23d813801c74ed37079a
2014-09-19 11:30:27 -07:00
Calin Juravle
371acf350f am e8892aa4: Merge "Push ISA features into system properties" into lmp-dev
* commit 'e8892aa4ec043fa86fe6c0dbe58f8586fd636bcd':
  Push ISA features into system properties
2014-08-26 17:57:11 +00:00
Calin Juravle
68b246401d Push ISA features into system properties
We need to know instruction set featues at runtime as well so that the
apps get compiled on target with the proper features. The properties are
read by installd and passed to dex2oat.

Bug: 16716262

(cherry picked from commit 28be9d8884)

Change-Id: I45b363558dea17e9b049e4a83a55990b4911d9d8
2014-08-26 18:47:44 +01:00
Calin Juravle
28be9d8884 Push ISA features into system properties
We need to know instruction set featues at runtime as well so that the
apps get compiled on target with the proper features. The properties are
read by installd and passed to dex2oat.

Bug: 16716262
Change-Id: Ia73f2055f696880d45a63a0d6e0ee98d37a01113
2014-08-26 18:05:52 +01:00
Brian Carlstrom
cced082f5d Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [build]
This will allow us to conditionally change the compiler-filter based on other properties.

Bug: 15165413

(cherry picked from commit 4d30e5e260)

Change-Id: I84e8038c6536291e6775f39b33556b8169fdf292
2014-08-06 17:50:39 -07:00
Brian Carlstrom
479eca858c resolved conflicts for merge of 9b80095e to lmp-dev-plus-aosp
Change-Id: Id37b96441818c5542b8c340f968183162a47191a
2014-08-04 12:21:46 -07:00
Brian Carlstrom
4d30e5e260 Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [build]
This will allow us to conditionally change the compiler-filter based on other properties.

Bug: 15165413
Change-Id: Ie3f9292d35e9d4abf93271b7d22b72d185ee5ce2
2014-07-30 15:57:16 -07:00
Ying Wang
495630f653 Don't fail the build for dangling module names.
Change-Id: I939253552e7ca6a672f662ae6be3eac41f5bab41
2014-07-30 10:20:56 -07:00
Ying Wang
06940df713 resolved conflicts for merge of ef44fb2d to lmp-dev-plus-aosp
Change-Id: I5551e6b1303f2b37d199a1b894f37c50839fdecc
2014-07-17 14:51:13 -07:00
Ying Wang
b2be5ffded Remove linker64 and debuggerd64
We don't have separate *64 module names any more.
Now both 32-bit and 64-bit variants are built under the same module name.

Change-Id: I1956a6a88ec6fe280798be01928239d098dfe27a
2014-07-17 14:01:12 -07:00
Ying Wang
1a9e1b43e9 am daaec135: am 5899ad25: am b00bb2d8: Merge "Resolve :32 to 32-bit variant only if the variant exists."
* commit 'daaec135b4d141335fc1f4e3edf9eb526c9f6954':
  Resolve :32 to 32-bit variant only if the variant exists.
2014-06-24 19:42:46 +00:00
Ying Wang
daaec135b4 am 5899ad25: am b00bb2d8: Merge "Resolve :32 to 32-bit variant only if the variant exists."
* commit '5899ad254d3b94653b88e5f0f41f54690f22bd24':
  Resolve :32 to 32-bit variant only if the variant exists.
2014-06-24 19:35:31 +00:00
Ying Wang
7e73eb3f7c Resolve :32 to 32-bit variant only if the variant exists.
Otherwise we just use the original module name.
With this change :32 in 32-bit product configuration will be installed
as expected.

Change-Id: Ibbbf3e8807a17b47f4259c00000a63336bc02f92
2014-06-24 10:22:17 -07:00
Colin Cross
a1ac473676 am b110da5f: am 9d8854e3: Merge "build: delete 64-bit blacklist"
* commit 'b110da5f2bf9cf105dd675648075d13c942d1892':
  build: delete 64-bit blacklist
2014-06-18 20:24:56 +00:00
Colin Cross
bf2f0c729b am a1ac4736: am b110da5f: am 9d8854e3: Merge "build: delete 64-bit blacklist"
* commit 'a1ac47367636c0473156679f8f30af626df7da85':
  build: delete 64-bit blacklist
2014-06-18 21:40:27 +00:00
Colin Cross
ae2986e51a build: delete 64-bit blacklist
The last projects in the blacklist have been fixed, delete the code.

Change-Id: I0fe7809bd18e32516374c9cb2a6f71df1d3c62ee
2014-06-17 21:35:44 -07:00
Ying Wang
0d26882d85 am 2ebf7c1c: am 6b468193: am cc2a47bf: Merge "Check existence of both 64-bit and 32-bit module variants."
* commit '2ebf7c1c5f3e04f13fa7d80dcc5d060306a8a475':
  Check existence of both 64-bit and 32-bit module variants.
2014-06-11 21:37:45 +00:00
Ying Wang
01c4f4622b am dceddd91: am 79b46720: am 02f98a26: Merge "Fix loophole in module expansion."
* commit 'dceddd91d9a6516346e752b9f942747bea931cfa':
  Fix loophole in module expansion.
2014-06-11 20:49:20 +00:00
Ying Wang
2ebf7c1c5f am 6b468193: am cc2a47bf: Merge "Check existence of both 64-bit and 32-bit module variants."
* commit '6b468193536c1925944ccbf6269ee057e080aef4':
  Check existence of both 64-bit and 32-bit module variants.
2014-06-11 02:29:37 +00:00
Ying Wang
dceddd91d9 am 79b46720: am 02f98a26: Merge "Fix loophole in module expansion."
* commit '79b46720e606e3db5fff87f672b73613a9a19c69':
  Fix loophole in module expansion.
2014-06-10 22:29:18 +00:00
Ying Wang
ff3a904522 Check existence of both 64-bit and 32-bit module variants.
- Do the module name resolving for both host and target modules.
- Check existence of both 64-bit and 32-bit module variants.

Change-Id: I8ada0e734efac6c8dafade8708fff9797b19a78d
2014-06-10 19:23:29 -07:00
Ying Wang
e1b867dde7 Fix loophole in module expansion.
Previously we only expanded product_MODULES with LOCAL_REQUIRED_MODULES,
but not modules introduced by LOCAL_SHARED_LIBRARIES; Later we did a further
shared libary expansion in vendor_module_check.mk.
It couldn't track C in the following case:
A : B, by LOCAL_SHARED_LIBRARIES; B : C, by LOCAL_REQUIRED_MODULES.

With this change, we transformed the LOCAL_SHARED_LIBRARIES dependencies
into LOCAL_REQUIRED_MODULES dependencies before doing the required
module expansion and the loophole is closed.
All module names are now expanded to product_MODULES now and it makes
vendor_module_check.mk simpler.

Change-Id: I8835a478d2ce0ce10601a8449f446f07b01c2b7f
2014-06-10 14:30:30 -07:00
Brian Carlstrom
c93c03081b am ab6f84e3: am e0df9d95: Merge "Only enable WITH_DEXPREOPT by default for libdvm.so"
* commit 'ab6f84e3d1886237e9516ebe4660d8e1042a6a75':
  Only enable WITH_DEXPREOPT by default for libdvm.so
2014-05-29 21:06:19 +00:00
Brian Carlstrom
3f5ff08dc5 Only enable WITH_DEXPREOPT by default for libdvm.so
Bug: 14298175

(cherry picked from commit 9f8e214a91)

Change-Id: I96ba4e198b7bc1b7d9a502c432590f41c87d05c4
2014-05-29 09:38:04 -07:00
Brian Carlstrom
e469ea36ff am 9f8e214a: Only enable WITH_DEXPREOPT by default for libdvm.so
* commit '9f8e214a919097284a88cb19a1b85ceafc202a67':
  Only enable WITH_DEXPREOPT by default for libdvm.so
2014-05-29 16:37:20 +00:00
Brian Carlstrom
9f8e214a91 Only enable WITH_DEXPREOPT by default for libdvm.so
Bug: 14298175
Change-Id: I42255a61667f88924a779fff1812134044c7b6b2
2014-05-28 22:13:07 -07:00
Ying Wang
1dc4f0bace am 2bf10a72: am cdcb6926: am 6cb69bd4: Merge "Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build"
* commit '2bf10a72f87a8e97923286aa331f7db81e2361ca':
  Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build
2014-05-23 19:43:57 +00:00
Ying Wang
2bf10a72f8 am cdcb6926: am 6cb69bd4: Merge "Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build"
* commit 'cdcb6926d40b502ed89a285cdd4d99beb4cf8009':
  Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build
2014-05-23 17:48:27 +00:00
Ying Wang
9734252ccf Don't build tests in PDK build.
Change-Id: I8994be0938a3ce87a097669c28b232fd04b77a36
2014-05-21 17:45:52 -07:00
Ying Wang
c2c368fb76 check build tests modules in eng and userdebug builds
To catch more build breakage, check build tests modules in eng and
userdebug builds.

Change-Id: Ic3b34dcd199e50e555c33eb686a501acef59a8c2
2014-05-21 11:00:57 -07:00
Ying Wang
966c1e0cae Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build
We already support pure 32-bit and 64-bit-by-default multilib build.
With HOST_PREFER_32_BIT we can build 32-bit-by-default multilib build.
This will be lest disruptive during the period we transition to
64-bit-by-default.

Bug: 13751317
Change-Id: I0d56ce4abbe4afeaacfd70d709f6a349791c0722
2014-05-20 18:03:21 -07:00
Ying Wang
8200231ae1 am e50f2d9f: am 40b49d30: am a74ade94: Merge "Support host multilib build"
* commit 'e50f2d9f32a27d8290692dbf99ab8b247ef9d553':
  Support host multilib build
2014-05-15 01:09:49 +00:00