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
Tony Mantler
fab9a1f267
Add preference and recommendation libs to SDK build
...
Change-Id: I00c716c42ffbd04b382b1b3016fcc19e9321ae48
2015-08-28 13:29:54 -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
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
Miao Wang
04a194c0c9
For RenderScript support lib use libblasV8.so instead of libblas.so
...
fix the sdk build.
Bug: 22693954
Change-Id: Ie283ed6834520c74c5e0f2dcdc18dbeb79e2c428
2015-07-27 17:09:45 -07:00
Chris Craik
9d78bc10c8
Support new systrace file structure
...
bug:22636165
Change-Id: I5c5b634df4350da68f5dc2ee5018fd90654adc70
2015-07-21 14:03:58 -07:00
Stephen Hines
61bd4a36d1
am ca884910: am b85e0a9e: Merge "Remove unnecessary clang from product_sdk.mk."
...
* commit 'ca8849100316519138d3674dfa05d44e4ae83c1a':
Remove unnecessary clang from product_sdk.mk.
2015-06-25 22:21:38 +00:00
Stephen Hines
ca88491003
am b85e0a9e: Merge "Remove unnecessary clang from product_sdk.mk."
...
* commit 'b85e0a9e59c27a56ac788235547a003039b44980':
Remove unnecessary clang from product_sdk.mk.
2015-06-25 22:07:47 +00:00
Stephen Hines
cfa3da6aae
am 5cf9df16: am 2ca0c6f9: Merge "Add clang.exe to Windows SDK build."
...
* commit '5cf9df169626377218d86ee2bc1c464c9791741c':
Add clang.exe to Windows SDK build.
2015-06-25 21:46:02 +00:00
Stephen Hines
27241e7056
Remove unnecessary clang from product_sdk.mk.
...
It is sufficient to just have this exist in windows_sdk.mk.
Change-Id: I33e4b41622bd7891f5e4868ba0e5138f3d83fa1f
2015-06-25 14:37:59 -07:00
Stephen Hines
5cf9df1696
am 2ca0c6f9: Merge "Add clang.exe to Windows SDK build."
...
* commit '2ca0c6f9b6b3bbe53490af5a07cb9599761123e3':
Add clang.exe to Windows SDK build.
2015-06-25 21:26:39 +00:00
Stephen Hines
eb8b46d7a7
Add clang.exe to Windows SDK build.
...
Bug: 22044739
This is needed as part of the NDK itself, now that we are shipping the
platform Clang as the one true Clang. It can be built by doing:
make winsdk-tools
Change-Id: I3363f46b5dcc52258aa92b42b5a92a96bf868e73
2015-06-25 14:11:11 -07:00
Chris Craik
4697e4fbef
am d7ad7710: am 400ae3d4: Merge "Support new systrace file structure after refactor"
...
* commit 'd7ad7710dd4f0299623650308f27f22dec6fedc2':
Support new systrace file structure after refactor
2015-06-23 01:57:32 +00:00
Chris Craik
d7ad7710dd
am 400ae3d4: Merge "Support new systrace file structure after refactor"
...
* commit '400ae3d4e7aebae8476bdc0dc688d454f6917a21':
Support new systrace file structure after refactor
2015-06-23 01:44:41 +00:00
Zhen Wang
05819dbf05
Support new systrace file structure after refactor
...
This is needed for
https://android-review.googlesource.com/#/c/154850/
Change-Id: Ibd5f33d0c038bfba37d81b23234945b9033c210a
Signed-off-by: Zhen Wang <zhenw@google.com >
2015-06-22 15:44:20 -07:00
Miao Wang
4ca3aa6a60
[RenderScript] update sdk.atree to include libblas.so
...
bug: 21902810
Change-Id: Ia2ffb4ccfbba5201d4811919acfc37b6f13812b0
2015-06-17 18:08:22 -07:00
bohu
b5c9450d7f
Merge "Fix size and sha1sum for some sdk targets" into mnc-dev
2015-06-02 20:13:05 +00:00
Xavier Ducrohet
f4c73da84f
Update structure for the build-tools/plat-tools.
...
Change-Id: Idf0d8cd41812ca92d8bb6910c4bd7d64eaaff51a
2015-06-02 11:20:00 -07:00
bohu
52e0bf3967
Fix size and sha1sum for some sdk targets
...
Targets such as sdk_google_phone_{x86,arm,...}-sdk
have wrong size and sha1sum in the repo-sys-img.xml,
because the sdk_repo.mk file incorrectly over-writes
the final images zip.
bug: 20927015
Change-Id: I151c8759c299d4a943f00ca2734ef65dea727262
2015-06-01 17:35:50 -07:00
Trevor Johns
c5bbbe3c68
Add MNC samples to sdk.atree
...
Change-Id: I8e7493f5da88fe0f7711df5b2ee31877bd88a0c3
2015-05-27 13:34:42 -07:00
Xavier Ducrohet
a0de890405
Fix build breakage again.
...
Forgot to change the new location of llvm-rs-cc
Change-Id: Ief422e11cdb9a5205032afb1c47de97af95d80c1
2015-05-20 18:36:40 -07:00
Xavier Ducrohet
19b0ecb120
Fix build breakage.
...
The windows build needs to delete build tools from the new location.
Change-Id: Ifb77a5e4558734dba7eeca6c784d5fa8aeb391d4
2015-05-20 15:04:11 -07:00
Xavier Ducrohet
5fb89112f6
Merge "Fix build tools packaging." into mnc-dev
2015-05-20 19:04:55 +00:00
Xavier Ducrohet
7d6d0d4ebb
Fix build tools packaging.
...
Move exe under bin/ and the libraries under lib/
Change-Id: Id9fa6bf921e69810f92876623bd69302e85f7a61
2015-05-20 08:55:03 -07:00
Tor Norbye
bae9765fd0
Install SDK annotations as platform-tools/api/annotations.zip
...
Change-Id: I091ab3e41e927f2dd0ecb195155cb2d6d61f5ed3
2015-05-19 14:08:45 -07:00
Yohann Roussel
cfaf1bffea
[DO NOT MERGE] Compile using Jack
...
Declare target to allow compilation to Jack files.
This includes cherry-picks of the following changes:
83efd5e421
491a3adb8d
Change-Id: Ia1bb627debb87c413ab2a184bd50d8510fd5cd45
2015-05-19 18:17:05 +02:00
Deepanshu Gupta
22e1a9ab03
Merge "Remove ICU from LayoutLib." into mnc-dev
2015-05-14 04:53:29 +00:00
Filip Gruszczynski
38c6c69da2
am ab748c01: Merge "Sample for percent support library." into lmp-mr1-ub-dev
...
* commit 'ab748c0115a72c44c22baca1db961c9a35b1c277':
Sample for percent support library.
2015-05-14 00:43:26 +00:00