Commit Graph

550 Commits

Author SHA1 Message Date
Mathieu Chartier 0626a6421e am 783a632f: am 7f914204: am 55fbc49f: Merge "Change eng builds from interpret-only to verify-at-runtime"
* commit '783a632f45fdddaa2073445728db61d2041a3435':
  Change eng builds from interpret-only to verify-at-runtime
2015-03-23 22:55:28 +00:00
Mathieu Chartier 62a7cac50d Change eng builds from interpret-only to verify-at-runtime
Faster dex2oat -> faster boot after syncing core libraries.

Bug: 19762303
Change-Id: Ic266ed9c59829e0e18acc4adc103724cf480de7f
2015-03-20 11:15:20 -07:00
Mathieu Chartier eda38d7718 am b01a4ca3: am 68f6e305: am 9682e56a: Merge "Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit""
* commit 'b01a4ca3c838007d2e8f71c01b37f8e878cff686':
  Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
2015-03-19 17:06:47 +00:00
Mathieu Chartier 8b11285dd9 Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
Bug: 19735273

This reverts commit 3abfcfc17b.

Change-Id: Iac930925ab6d5cd5947fa4077c8d93e2984927d5
2015-03-18 19:06:28 -07:00
Mathieu Chartier 7c2d49dcb9 am 7b93109e: am d7f3d8ba: am 8ca542f4: Merge "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
* commit '7b93109e48f90f756228bfe399b67d5d8cc306b0':
  Rename dalvik.vm.usejit to debug.dalvik.vm.usejit
2015-03-17 14:47:31 +00:00
Mathieu Chartier 3abfcfc17b Rename dalvik.vm.usejit to debug.dalvik.vm.usejit
Bug: 19735273
Change-Id: Ia0d748b511230f5e0c7d0763de3abeab9d6e0ca7
2015-03-16 16:29:30 -07:00
Ying Wang f738b3bb9f Load cts/build/config.mk after build/core/config.mk
So that the cts config.mk can use global variables set by the core build
system config.mk.

Change-Id: I2571564abbb53257eee54485a3357ab1305eb870
(cherry picked from commit bacf5f8008)
2015-03-16 10:56:03 -07:00
Mathieu Chartier 0694eabe4d JIT default opt-in
Bug: 17950037

(cherry picked from commit 2a2a03046e)

Change-Id: I97fd6b1797e54ad3dea1930889f32a717543490d
2015-03-12 18:27:54 -07:00
Mathieu Chartier 2a2a03046e JIT default opt-in
Bug: 17950037
Change-Id: I97fd6b1797e54ad3dea1930889f32a717543490d
2015-03-12 14:45:22 -07:00
Ying Wang bacf5f8008 Load cts/build/config.mk after build/core/config.mk
So that the cts config.mk can use global variables set by the core build
system config.mk.

Change-Id: I2571564abbb53257eee54485a3357ab1305eb870
2015-02-13 10:28:40 -08:00
Ying Wang 3e9b20e430 am 16ba2ed8: resolved conflicts for merge of 4c178ebc to lmp-mr1-dev-plus-aosp
* commit '16ba2ed82bc084d5355477a381cc0bcc8b60a7bd':
  Remove support of factory ramdisk/bundle.
2015-02-04 19:33:14 +00:00
Ying Wang 16ba2ed82b resolved conflicts for merge of 4c178ebc to lmp-mr1-dev-plus-aosp
Change-Id: If84527e9333b855d406dc7ac317868f4cfd3f1f2
2015-02-04 11:28:56 -08:00
Ying Wang 14cc23d433 Remove support of factory ramdisk/bundle.
Bug: 18779515
Change-Id: Ia6d51d43965447e2e95944a7d2b4b41adb121cb7
2015-02-04 11:00:01 -08:00
Ying Wang 38a9d5a739 am 10500d0e: resolved conflicts for merge of 5cb4276e to lmp-mr1-dev-plus-aosp
* commit '10500d0ea7706a6a137e8afdd347d927f5512488':
  Add target recoveryimage-nodeps.
2015-01-31 02:00:26 +00:00
Ying Wang 10500d0ea7 resolved conflicts for merge of 5cb4276e to lmp-mr1-dev-plus-aosp
Change-Id: Ia7f011f24276e7e8e045a2544e5dff2b758b1c62
2015-01-30 16:57:37 -08:00
Ying Wang 747b9f18f0 Add target recoveryimage-nodeps.
Change-Id: Ie7d11ae8f40260bf23481931c18523895c87ebd7
2015-01-30 14:16:00 -08:00
Ying Wang 4d26681f3d resolved conflicts for merge of 0f205ad9 to master
Change-Id: Ic741805a0037d8d29d7d5ff6e2b6e83067943f12
2015-01-22 11:54:58 -08:00
Christopher Ferris 8b62f12195 am 9f9ccbfd: Merge "Fix missing parenthesis."
* commit '9f9ccbfd6a84e56df00c49b0aec25236b702e01d':
  Fix missing parenthesis.
2015-01-22 00:13:30 +00:00
Christopher Ferris a8f5b8d0e2 Fix missing parenthesis.
Change-Id: Ib9eda50a6f9096dad35cf81ac3b3cdc26636a016
2015-01-20 18:23:05 -08:00
Ying Wang f1db7e23d9 Support to build AAR for static Java libraries.
Set up rules to build $(built_aar), if a static Java library has Android
resources.
If you run "tapas my_lib && make dist", my_lib.aar will be built and put
in the DIST_DIR.

Bug: 18759503
Change-Id: I36b912eb7bbab241fe48319115ea320efe77c705
2014-12-18 12:02:38 -08:00
Ying Wang 912da64598 am 73a730ca: Merge "Remove libdvm support from the core build system."
* commit '73a730caf566fb778ad36f6d991666c482918d22':
  Remove libdvm support from the core build system.
2014-12-16 21:47:13 +00:00
Ying Wang d54520a667 Remove libdvm support from the core build system.
Now libart is the only supported runtime and
we don't need the build variables PRODUCT_RUNTIMES and
DALVIK_VM_LIB.

Bug: 18465297
Change-Id: Ibfda931cde0649163d79b584fb5ccad927a9bc2b
2014-12-16 10:08:00 -08:00
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