Commit Graph

932 Commits

Author SHA1 Message Date
Yohann Roussel
1147731080 Ensure Jack server is running before any use
Change-Id: I6748c9c31e1df305c7dcc2568dbba50be4348e07
2015-12-22 14:57:28 +01:00
Shinichiro Hamaji
8b09785ad2 Enable .toc optimization for SDK stub
As we don't build .dex file for SDK stub, use .jar.toc even for
the .jack file. This should be safe we are building the .jack
file from .jar file.

This was actually necessary to achieve performance improvement
mentioned in https://android-review.googlesource.com/#/c/186470/

Bug: 24597504
Change-Id: I7d4518421b64510ce83229d9f19a654888753a84
2015-12-16 09:52:22 +09:00
Shinichiro Hamaji
ee81f7eb90 Define a rule to build a dummy .dex.toc file
This is a preparation of
https://android-review.googlesource.com/#/c/186470/

Bug: 24597504
Change-Id: I5b403f4b3ae29579d11653103464819c61063b3e
2015-12-14 18:34:45 +09:00
Shinichiro Hamaji
477d5d1770 Merge "Generate .toc for android_stubs_current.jar"
am: 6cf9ae5b6b

* commit '6cf9ae5b6bc8b3bebd9769617c06845402b0a7a5':
  Generate .toc for android_stubs_current.jar
2015-11-21 00:48:19 +00:00
Shinichiro Hamaji
6198f07189 Generate .toc for android_stubs_current.jar
This should be landed before we merge the main change, which
defines define-jar-to-toc-rule.

https://android-review.googlesource.com/#/c/181833/

Bug: 24597504
Change-Id: Icc3394690fb7949cfb89eff951ce3c394d273205
2015-11-19 17:14:15 +09:00
Yohann Roussel
208bec8842 Merge "Change jack/dex target dependency to jack script" am: 865c462b1a
am: fb3e9e0582

* commit 'fb3e9e05822dca74c81744da389227bbaec53bf2':
  Change jack/dex target dependency to jack script
2015-10-22 10:53:27 +00:00
Yohann Roussel
fb3e9e0582 Merge "Change jack/dex target dependency to jack script"
am: 865c462b1a

* commit '865c462b1a5d30c745309196f49d25d64236697d':
  Change jack/dex target dependency to jack script
2015-10-22 10:50:48 +00:00
Yohann Roussel
bf579123c5 Change jack/dex target dependency to jack script
Instead of jack.jar.

(cherry picked from commit 1d489a3333)

Change-Id: I92b4183feb50189a994603f35444ff1bc4872da8
2015-10-21 17:03:12 +02:00
Tor Norbye
28c210b844 Pass in current android.jar to api-generator
This ensures that the api-versions.xml shipped with
the SDK always includes the correct latest API
data (see http://b.android.com/183500)

(cherry picked from commit fbe6c8105a)

(cherry picked from commit 82336df0c1)

Change-Id: Ied1441430f023f7680ef4fe43e45eeda5162fa60
2015-10-15 09:03:14 -07:00
Miao Wang
050c66aa7d resolved conflicts for 3db22d4d to mnc-dr-dev-plus-aosp
Change-Id: I2baac9e5b218fba7ec7cc4df9b518b6b90a343d2
2015-10-13 18:02:44 -07:00
Miao Wang
3db22d4d14 am c0781cd7: am 10b385c0: am afe2d242: Fix llvm-rs-cc.exe crash for windows
* commit 'c0781cd7744ee4ae2a8f95c14724a9b05698174b':
  Fix llvm-rs-cc.exe crash for windows
2015-10-14 00:10:45 +00:00
Miao Wang
afe2d24204 Fix llvm-rs-cc.exe crash for windows
- Move the dlls needed by llvm-rs-cc to the same folder as the
   executable.

Bug: 23315748
Change-Id: I2d306684fcfd1c600c1bdb6f7050d671601c6b17
2015-10-13 21:34:51 +00:00
Tor Norbye
82336df0c1 Pass in current android.jar to api-generator
This ensures that the api-versions.xml shipped with
the SDK always includes the correct latest API
data (see http://b.android.com/183500)

Change-Id: I96a6b0218abeaf3865a49de0fdd2be933f88c469
(cherry picked from commit fbe6c8105a)
2015-09-26 22:21:29 +00:00
Yohann Roussel
eeaccc2291 am 03ae930a: am 9e2e8392: Merge "Pick installed Jack & Jill for the sdk"
* commit '03ae930a7382b0c58640449dd115d4fcc33970e6':
  Pick installed Jack & Jill for the sdk
2015-09-15 07:46:21 +00:00
Yohann Roussel
03ae930a73 am 9e2e8392: Merge "Pick installed Jack & Jill for the sdk"
* commit '9e2e8392ae22051d775e093e6faba721d8b919eb':
  Pick installed Jack & Jill for the sdk
2015-09-15 07:38:40 +00:00
Yohann Roussel
9e2e8392ae Merge "Pick installed Jack & Jill for the sdk" 2015-09-15 07:31:54 +00:00
Dan Willemsen
a81bc96be3 am 033ea23f: am 7ad271e7: Merge "Update windows sdk to build non-recursively"
* commit '033ea23f59f78e253affbc0d2745083339ca1fd7':
  Update windows sdk to build non-recursively
2015-09-09 18:25:42 +00:00
Dan Willemsen
033ea23f59 am 7ad271e7: Merge "Update windows sdk to build non-recursively"
* commit '7ad271e7742a904485c8fdf51206ba068bf5160f':
  Update windows sdk to build non-recursively
2015-09-09 18:19:05 +00:00
Dan Willemsen
7ad271e774 Merge "Update windows sdk to build non-recursively" 2015-09-09 18:13:21 +00:00
Chris Craik
264843a896 am 7126aedf: am 8ae499e1: Merge "Support new systrace file structure after switching to catapult"
* commit '7126aedfb2f907e34b14ed63d90eb24326ed7521':
  Support new systrace file structure after switching to catapult
2015-09-02 17:32:01 +00:00
Chris Craik
7126aedfb2 am 8ae499e1: Merge "Support new systrace file structure after switching to catapult"
* commit '8ae499e1d3bf7915cd53b410eb8debda66595b86':
  Support new systrace file structure after switching to catapult
2015-09-02 17:23:20 +00:00
Tony Mantler
c2d8765eac am 3dd5d840: Fix typo in SDK generation
* commit '3dd5d840f875e9a28e5b113e3bffc2efb343d653':
  Fix typo in SDK generation
2015-09-01 16:08:29 +00:00
Tony Mantler
3dd5d840f8 Fix typo in SDK generation
Change-Id: I5658bcfc1910562f17d094e81dc60a7c74a4467c
2015-08-31 15:27:14 -07:00
Tony Mantler
013441f296 resolved conflicts for merge of fab9a1f2 to mnc-dr-dev-plus-aosp
Change-Id: I5cd69798c3880b835cdebf45dcaf90a8b26a1d4d
2015-08-28 15:56:49 -07:00
Dan Willemsen
349f891d94 Update windows sdk to build non-recursively
Now the build system can support a HOST_CROSS_OS to build both linux and
windows binaries at the same time.

Bug: 23566667
Change-Id: I82b497c2621fbfbe493d0568fca42863c5fe9433
2015-08-28 13:30:16 -07:00
Tony Mantler
fab9a1f267 Add preference and recommendation libs to SDK build
Change-Id: I00c716c42ffbd04b382b1b3016fcc19e9321ae48
2015-08-28 13:29:54 -07:00
Zhen Wang
fe9acde0a2 Support new systrace file structure after switching to catapult
Change-Id: Ib7e99ff8d5679e32673a62ada7a9e1d9ad2e75cb
Signed-off-by: Zhen Wang <zhenw@google.com>
2015-08-28 12:43:01 -07:00
Yusuf Ozuysal
d0a7cb4a17 am 517a2f27: Revert "Add customtabs support lib to extras/android/support/"
* commit '517a2f27bfd997a09679126a78e3d1a8a0e58dd1':
  Revert "Add customtabs support lib to extras/android/support/"
2015-08-27 21:59:08 +00:00
Yusuf Ozuysal
7615d82816 am ac16badc: am e226a0f5: Add customtabs support lib to extras/android/support/
* commit 'ac16badc765571198fbafa7694c991c927643ed7':
  Add customtabs support lib to extras/android/support/
2015-08-27 21:47:57 +00:00
Yusuf Ozuysal
517a2f27bf Revert "Add customtabs support lib to extras/android/support/"
This reverts commit 53ad2de7f6.

Change-Id: Ia9831d344e6e0b12c55544b02254daae109f09c5
(cherry picked from commit 04a6dcacf0)
2015-08-27 21:45:26 +00:00
Yusuf Ozuysal
ac16badc76 am e226a0f5: Add customtabs support lib to extras/android/support/
* commit 'e226a0f56949b1d6ab97a31ed987adb7f7513be9':
  Add customtabs support lib to extras/android/support/
2015-08-27 21:42:54 +00:00
Tor Norbye
51397c4b44 am 1f2c59af: Merge "Pass in current android.jar to api-generator" into mnc-ub-dev
* commit '1f2c59aff8691075606294dc8feb6d3979d46a7b':
  Pass in current android.jar to api-generator
2015-08-27 21:27:15 +00:00
Yusuf Ozuysal
e226a0f569 Add customtabs support lib to extras/android/support/
Currently the only way to get access to customtabs library through
download m2repository and using the aar file whereas all other
support libs are also present in extras/android/support/ with
the corresponding resources and jar file.

This adds the jar and manifest to the corresponding folder to avoid
the confusion to developers.

This is relanding
https://googleplex-android-review.git.corp.google.com/#/c/756492/
after it was reverted due to not having the corresponding Android.mk
change.

Change-Id: I21969994e1dd0bb4f9abbfa395cf284e3cfc396d
2015-08-27 18:29:07 +00:00
Yusuf Ozuysal
e98b87f3fb am c3d6f680: am 04a6dcac: Revert "Add customtabs support lib to extras/android/support/"
* commit 'c3d6f6802950a70cd6ed241b67563da3b0f41e99':
  Revert "Add customtabs support lib to extras/android/support/"
2015-08-27 04:53:21 +00:00
Yusuf Ozuysal
04a6dcacf0 Revert "Add customtabs support lib to extras/android/support/"
This reverts commit 53ad2de7f6.

Change-Id: Ia9831d344e6e0b12c55544b02254daae109f09c5
2015-08-26 23:31:45 +00:00
Yusuf Ozuysal
9df340b175 am 1c6e1387: am 53ad2de7: Add customtabs support lib to extras/android/support/
* commit '1c6e1387a2b8c956fe356557e6ee7e2249778721':
  Add customtabs support lib to extras/android/support/
2015-08-26 19:23:55 +00:00
Yusuf Ozuysal
31338f7196 am 53ad2de7: Add customtabs support lib to extras/android/support/
* commit '53ad2de7f6677c31eb42dbd117b4857f38fc36f4':
  Add customtabs support lib to extras/android/support/
2015-08-26 18:55:08 +00:00
Tor Norbye
fbe6c8105a Pass in current android.jar to api-generator
This ensures that the api-versions.xml shipped with
the SDK always includes the correct latest API
data (see http://b.android.com/183500)

Change-Id: I96a6b0218abeaf3865a49de0fdd2be933f88c469
2015-08-26 01:39:51 +00:00
Yusuf Ozuysal
53ad2de7f6 Add customtabs support lib to extras/android/support/
Currently the only way to get access to customtabs library through
download m2repository and using the aar file whereas all other
support libs are also present in extras/android/support/ with
the corresponding resources and jar file.

This adds the jar and manifest to the corresponding folder to avoid
the confusion to developers.

Change-Id: Id6d71e4071c0725257cadb539cd47230d6727914
2015-08-25 15:46:58 -07:00
Dan Willemsen
128cd0c33b am 283439c7: am d592f8c7: Merge "Remove the mingw package check"
* commit '283439c70091ab77daa566884db2c0f20bcac5c9':
  Remove the mingw package check
2015-08-13 21:46:32 +00:00
Dan Willemsen
ab842478d4 am 283439c7: am d592f8c7: Merge "Remove the mingw package check"
* commit '283439c70091ab77daa566884db2c0f20bcac5c9':
  Remove the mingw package check
2015-08-13 21:46:25 +00:00
Dan Willemsen
283439c700 am d592f8c7: Merge "Remove the mingw package check"
* commit 'd592f8c716ec53b65cb9c046ae5b57a75082a929':
  Remove the mingw package check
2015-08-13 21:39:44 +00:00
Dan Willemsen
cb994dd019 Remove the mingw package check
We're using mingw prebuilts checked into the tree now, the external
package is no longer necessary.

Change-Id: I349f9605d3d09decc3ec5df3ba595728c0a2727c
2015-08-13 14:27:23 -07:00
Yohann Roussel
8c61bb43f3 Pick installed Jack & Jill for the sdk
(cherry picked from commit 7ca5ad69db)

Change-Id: Ied8d420f05012e2072f11bb7c63fd3c53afa664e
2015-08-05 11:47:45 +02:00
Ying Wang
896afb075d resolved conflicts for merge of 0f32d65d to mnc-dr-dev-plus-aosp
Change-Id: I5be45feb780c67c08dbef035f2f6481ae6338f90
2015-08-03 11:36:50 -07:00
Ying Wang
87108c8530 resolved conflicts for merge of 0f32d65d to mnc-dev-plus-aosp
Change-Id: I7da3ba971ccaf566be3e490846e5e306cdd2cf28
2015-08-01 11:01:00 -07:00
Ying Wang
0f32d65d6c am f6b91cf3: Merge "Switch to 64-bit host tools in Linux/Mac SDK build."
* commit 'f6b91cf39b54e0a6f59e53f4de968b0745350d7e':
  Switch to 64-bit host tools in Linux/Mac SDK build.
2015-08-01 17:30:36 +00:00
Ying Wang
fca823453b Switch to 64-bit host tools in Linux/Mac SDK build.
Bug: 22776595
Change-Id: Iadf56f045f6920d4e97c8b1219b1b3907213b12b
2015-07-31 13:38:57 -07:00
Miao Wang
0b562725a7 am b5102aaa: am 04a194c0: For RenderScript support lib use libblasV8.so instead of libblas.so
* commit 'b5102aaa7987f48fc3022fef75bc938bf8674e82':
  For RenderScript support lib use libblasV8.so instead of libblas.so
2015-07-28 01:19:46 +00:00
Miao Wang
d71980d941 am 04a194c0: For RenderScript support lib use libblasV8.so instead of libblas.so
* commit '04a194c0c92f9dd93500065d9c8eb02fa983bcbb':
  For RenderScript support lib use libblasV8.so instead of libblas.so
2015-07-28 00:36:10 +00:00