Commit Graph

889 Commits

Author SHA1 Message Date
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
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
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
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
Deepanshu Gupta
28c034b08f Remove ICU from LayoutLib.
Android now has its own version of ICU bundled. There's no need to
bundle a separate ICU jar.

Change-Id: Ic6a4decc4c4de3a095718e379952908208306784
2015-05-12 11:21:49 -07:00
Tor Norbye
9c30464eb1 Use new api-generator version: extracts deprecation info
This reverts commit 9f09636474.
2015-05-09 11:36:25 -07:00
Tor Norbye
9f09636474 Revert "Use new api-generator version: extracts deprecation info"
This reverts commit 833bdc79d8.

Change-Id: Ib08294a39b03c7831ffebf83487b9c6564401c31
2015-05-09 14:56:23 +00:00
Filip Gruszczynski
a9a9ec6d75 Sample for percent support library.
Change-Id: Id16bda966b0e2e920385486e8ee956c8beea2268
2015-05-07 19:29:12 -07:00
Tor Norbye
833bdc79d8 Use new api-generator version: extracts deprecation info
Change-Id: Id2e9e30fe5b9ba298f11bee4b07fb11d8a1cb802
2015-05-07 12:33:21 -07:00
Xavier Ducrohet
72f1c9535d Ability to generate SDK system-images for mips64
Change-Id: I9547a6059a68d1ae3861c35a328c1ff05ae3fc0f
(cherry picked from commit d63ae3ab15)
2015-05-01 16:50:27 +00:00
Xavier Ducrohet
83f4d2a1c9 Optional library listing file.
Also update some files for MNC.

Change-Id: I3901b07d72831cdb6557da1696ae4845e4d15be5
2015-04-24 13:17:36 -07:00
Ying Wang
f3dc31847e am 0273c81e: am 4ea82d63: Merge "Update prebuilts path."
* commit '0273c81e01c6c7462af00d9d5323422773bc1aa9':
  Update prebuilts path.
2015-04-23 22:19:22 +00:00
Ying Wang
0273c81e01 am 4ea82d63: Merge "Update prebuilts path."
* commit '4ea82d63dd67e1776885900a28d8f7057ce3c00f':
  Update prebuilts path.
2015-04-23 17:19:31 +00:00
Ying Wang
87f01085fe Update prebuilts path.
Bug: 20239510
Change-Id: Id2c699fb516d55deceffd8194a485b078564c8de
2015-04-23 10:00:15 -07:00
Ying Wang
a89998d469 Add org.apache.http.legacy.jar to the SDK package.
Change-Id: I3da0cb5b907c768615923123715be766f2d0d2a5
2015-04-21 17:33:58 -07:00
Deepanshu Gupta
4daceb87c5 Add resources to recyclerview dependency.
Change-Id: Ifa9ea3759702a59c09ee4d1e7523d4e954773882
(cherry picked from commit cc8bf5bfaa)
2015-04-21 11:22:11 -07:00
Deepanshu Gupta
cc8bf5bfaa Add resources to recyclerview dependency.
Change-Id: Ifa9ea3759702a59c09ee4d1e7523d4e954773882
2015-04-17 18:25:24 +00:00
Ying Wang
07dd2eb7e6 Update prebuilts path.
Bug: 20239510
Change-Id: Id2c699fb516d55deceffd8194a485b078564c8de
2015-04-15 12:31:49 -07:00
Chris Banes
64d5a34e12 am c5522cae: Merge "Revert "Disable the design support library and demos"" into lmp-mr1-ub-dev
* commit 'c5522cae8872dd761c4fe0289b63500328717e12':
  Revert "Disable the design support library and demos"
2015-04-09 07:27:58 +00:00
Chris Banes
f9cd4395a2 am 5fdbf918: Merge "Revert "Disable design lib in master build file"" into lmp-mr1-ub-dev
* commit '5fdbf91821442faab51330f69d5a3c20bf4793bb':
  Revert "Disable design lib in master build file"
2015-04-09 07:27:55 +00:00
Chris Banes
b859e355e5 Revert "Disable the design support library and demos"
This reverts commit 97930fc88b.

Change-Id: I363014ddaa19db82f076875a36b4c3c8697eb9cb
2015-04-09 07:17:57 +00:00
Chris Banes
5fdbf91821 Merge "Revert "Disable design lib in master build file"" into lmp-mr1-ub-dev 2015-04-09 07:17:13 +00:00
Chris Banes
d1723b40dd Revert "Disable design lib in master build file"
This reverts commit 988f263d5a.

Change-Id: Ieec3403b2f5976115aa9afe662bd6617ec86dd38
2015-04-09 07:16:59 +00:00