tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
4326 commits 1 branch 0 tags 119 MiB
Commit graph

4326 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brian Carlstrom
bb7c6d88c6 Tracking merge of dalvik-dev to master 
git cherry-pick --no-commit  5fac8d8f7096d8a950acad1ad0a8b963cef72e03

git cherry-pick --no-commit  1a8210710b46a0796ff2f8e76b6beb3a54f89019

git cherry-pick --no-commit  4fe2ac9f7284b838393aec8f0f48caef2510fd46

git cherry-pick --no-commit  7beb710a8f976fc4cb1e8be780644386870c4975

Change-Id: Ib10348e5509c906c6b95fa4accd6a18900bfe748
 2011-04-01 15:45:58 -07:00
Ying Wang
406cc1bb63 am a9be570b: resolved conflicts for merge of fdc3192e to honeycomb-plus-aosp 
* commit 'a9be570b5d5351bc13da1cbc0a5be3a6ea1113d1':
  Merge c4d4731b4d: 'Build SDK repository'. Do not merge.
 2011-03-31 18:08:00 -07:00
Ying Wang
a9be570b5d resolved conflicts for merge of fdc3192e to honeycomb-plus-aosp 
Change-Id: Idddf7afb063109654664ecac252cf6be73125c20
 2011-03-31 18:05:37 -07:00
Ying Wang
fdc3192e68 resolved conflicts for merge of bd0c91c8 to gingerbread-plus-aosp 
Change-Id: Ia4d8719337f84927f96a162b97df8a8bc62630e1
 2011-03-31 17:00:13 -07:00
Ying Wang
cd4e323e0e am ce467097: am 54aa74ef: am a9e5bb8a: am f78fb1d1: Merge "Use my-dir in a consistent way as others" 
* commit 'ce4670977d0367983e40ed339da793792fdb6e06':
  Use my-dir in a consistent way as others
 2011-03-31 15:16:36 -07:00
Ying Wang
ce4670977d am 54aa74ef: am a9e5bb8a: am f78fb1d1: Merge "Use my-dir in a consistent way as others" 
* commit '54aa74ef5da0a76a0fc1afdabaa24d2fb0744cd1':
  Use my-dir in a consistent way as others
 2011-03-31 15:14:32 -07:00
Ying Wang
f1075dc318 am 0c47a691: am 15fcee57: am c5e45492: am 4c401b1a: Merge "Fix argument handling in runhat() function" 
* commit '0c47a6919c162745e5295246ee6b4418c5ac4012':
  Fix argument handling in runhat() function
 2011-03-31 15:12:04 -07:00
Ying Wang
54aa74ef5d am a9e5bb8a: am f78fb1d1: Merge "Use my-dir in a consistent way as others" 
* commit 'a9e5bb8a6b2b772b07214e4dd0004f6989285dd0':
  Use my-dir in a consistent way as others
 2011-03-31 15:11:58 -07:00
Ying Wang
a9e5bb8a6b am f78fb1d1: Merge "Use my-dir in a consistent way as others" 
* commit 'f78fb1d1516e1d7448871ad3a2a403b12ff25f1a':
  Use my-dir in a consistent way as others
 2011-03-31 15:10:33 -07:00
Ying Wang
0c47a6919c am 15fcee57: am c5e45492: am 4c401b1a: Merge "Fix argument handling in runhat() function" 
* commit '15fcee57aa124c6f690eccab580502ed78e3746b':
  Fix argument handling in runhat() function
 2011-03-31 15:08:50 -07:00
Ying Wang
15fcee57aa am c5e45492: am 4c401b1a: Merge "Fix argument handling in runhat() function" 
* commit 'c5e45492fad4c5e45c1d5f0726c25877a601338e':
  Fix argument handling in runhat() function
 2011-03-31 15:01:53 -07:00
Ying Wang
c5e45492fa am 4c401b1a: Merge "Fix argument handling in runhat() function" 
* commit '4c401b1aabf5ad09c152d5e308bb13124c0a2d24':
  Fix argument handling in runhat() function
 2011-03-31 14:58:23 -07:00
Ying Wang
f78fb1d151 Merge "Use my-dir in a consistent way as others" 2011-03-31 14:54:56 -07:00
Ying Wang
4c401b1aab Merge "Fix argument handling in runhat() function" 2011-03-31 14:54:24 -07:00
Chris Dearman
f0bcf429d9 Fix argument handling in runhat() function 
Change-Id: I22fa264a3db516dcbe0cc9109dc20d6c004d3418
Signed-off-by: Raghu Gandham <raghu@mips.com>
 2011-03-31 14:45:03 -07:00
David 'Digit' Turner
2b6435ed0e am 9ddea2d4: am dc620647: am c09cc904: am dffd4058: Merge "build speedup: Do not use shell \'find\' function to look for NOTICE files." 
* commit '9ddea2d4e9c3aeeaad8d7b59bd6db4413a5cd9d3':
  build speedup: Do not use shell 'find' function to look for NOTICE files.
 2011-03-30 16:39:11 -07:00
Raphael
2c8d40b7aa am 59362407: (-s ours) am a5b8a040: (-s ours) am f0f1490d: am 57c70196: (-s ours) Merge "Merge c4d4731b4d: \'Build SDK repository\'. Do not merge." 
* commit '59362407c37930b881b31a81b86a56a3c02e0358':
  Merge c4d4731b4d: 'Build SDK repository'. Do not merge.
 2011-03-30 16:33:45 -07:00
Raphael
32107e1580 am 178ed2c5: resolved conflicts for merge of f761d642 to honeycomb-plus-aosp 
* commit '178ed2c5c5fc72a9d6b47047df009dc5eaffbbc9':
  Add more sdk lib tests to sdk build.
 2011-03-30 16:30:08 -07:00
David 'Digit' Turner
9ddea2d4e9 am dc620647: am c09cc904: am dffd4058: Merge "build speedup: Do not use shell \'find\' function to look for NOTICE files." 
* commit 'dc620647ef6c22b55b6de4992104f44c5f1c406c':
  build speedup: Do not use shell 'find' function to look for NOTICE files.
 2011-03-30 09:40:55 -07:00
Raphael
59362407c3 am a5b8a040: (-s ours) am f0f1490d: am 57c70196: (-s ours) Merge "Merge c4d4731b4d: \'Build SDK repository\'. Do not merge." 
* commit 'a5b8a040867edb54a3512579750dca0dd9898500':
  Merge c4d4731b4d: 'Build SDK repository'. Do not merge.
 2011-03-30 08:19:36 -07:00
David 'Digit' Turner
dc620647ef am c09cc904: am dffd4058: Merge "build speedup: Do not use shell \'find\' function to look for NOTICE files." 
* commit 'c09cc904f183907111de57581d55c181df8ef47f':
  build speedup: Do not use shell 'find' function to look for NOTICE files.
 2011-03-30 06:32:43 -07:00
David 'Digit' Turner
c09cc904f1 am dffd4058: Merge "build speedup: Do not use shell \'find\' function to look for NOTICE files." 
* commit 'dffd40587aff00c6852d64f5d7ed20d588bb993e':
  build speedup: Do not use shell 'find' function to look for NOTICE files.
 2011-03-30 06:25:22 -07:00
David 'Digit' Turner
dffd40587a Merge "build speedup: Do not use shell 'find' function to look for NOTICE files." 2011-03-30 06:17:39 -07:00
Raphael
178ed2c5c5 resolved conflicts for merge of f761d642 to honeycomb-plus-aosp 
Change-Id: Id0096682cbabd0d34f5d6b0a0151577d9140ea7d
 2011-03-29 15:57:29 -07:00
Ying Wang
74caa22f9f am aa906d59: am 7c7fbeaf: am 7bbea4b5: Disable dexpreopt for unbundled build. 
* commit 'aa906d59f4a6c03de13b7d01307215208f3c477e':
  Disable dexpreopt for unbundled build.
 2011-03-29 13:21:18 -07:00
Ying Wang
c545420b66 am 21baf916: am bef90c0e: am 3fd580d4: Fix dependency of prebuilt target non-static Java libraries. 
* commit '21baf9168f1b1aa77aa6d28d3c29b28ad9d9cee0':
  Fix dependency of prebuilt target non-static Java libraries.
 2011-03-29 13:21:16 -07:00
Ying Wang
aa906d59f4 am 7c7fbeaf: am 7bbea4b5: Disable dexpreopt for unbundled build. 
* commit '7c7fbeaf1a034c9cdc4c7c86eb84cf183a1b6728':
  Disable dexpreopt for unbundled build.
 2011-03-29 13:18:25 -07:00
Ying Wang
21baf9168f am bef90c0e: am 3fd580d4: Fix dependency of prebuilt target non-static Java libraries. 
* commit 'bef90c0ec0fa638e5d2ef0a721e3b3c5e3d9d7f1':
  Fix dependency of prebuilt target non-static Java libraries.
 2011-03-29 13:18:22 -07:00
Raphael
067d5c90a8 am 9b9da008: Merge "resolved conflicts for merge of 8c2d872a to honeycomb-plus-aosp" into honeycomb-plus-aosp 
* commit '9b9da008867252af03fa4585dd13e018939d3803':
  Add ddmlib-tests.jar to sdk build.
 2011-03-29 13:09:59 -07:00
Raphael
9b9da00886 Merge "resolved conflicts for merge of 8c2d872a to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-03-29 13:07:51 -07:00
Ying Wang
f4d284c159 am 954cc580: am fcf00d53: Support to build renderscript in unbundled apps. 
* commit '954cc580253a4b7f5b3a8c60457952f69eaa42ca':
  Support to build renderscript in unbundled apps.
 2011-03-29 12:57:54 -07:00
Ying Wang
954cc58025 am fcf00d53: Support to build renderscript in unbundled apps. 
* commit 'fcf00d53bfdfa18fab0873be2d4d2800c621f861':
  Support to build renderscript in unbundled apps.
 2011-03-29 12:56:03 -07:00
Raphael
f578a0a487 resolved conflicts for merge of 8c2d872a to honeycomb-plus-aosp 
Change-Id: Ied7d5ccb947094ea7f3334ee052eed39ee315a48
 2011-03-29 12:53:33 -07:00
Ying Wang
fcf00d53bf Support to build renderscript in unbundled apps. 
Change-Id: I8104be723f507df4f9673616bada11fb613651b7
 2011-03-29 11:47:12 -07:00
David 'Digit' Turner
3e0e611e76 build speedup: Do not use shell 'find' function to look for NOTICE files. 
The GNU Make wildcard function can be used to look for a specific file and
is _much_ faster than invoking the find command through $(shell ...).

Since notice_files.mk is included by base_rules.mk for each and every module
in the build tree, this represents a considerable speed-up. For example, when
building the full-eng product from the AOSP tree, the no-op "make" goes from
21 seconds to 16 seconds with this patch applied.

Change-Id: Ideb1bb74d5bfbb650834fa4b6e151ff24dcd0150
 2011-03-29 14:27:27 +02:00
David 'Digit' Turner
16292ce718 am 53d2a9a1: am 440d7e1e: am 9fe6dc2c: Merge "Support target-specific sdk/build/tools.atree extension." 
* commit '53d2a9a1acd2182a525401f3c1a82faff178a9d8':
  Support target-specific sdk/build/tools.atree extension.
 2011-03-28 17:43:50 -07:00
David 'Digit' Turner
53d2a9a1ac am 440d7e1e: am 9fe6dc2c: Merge "Support target-specific sdk/build/tools.atree extension." 
* commit '440d7e1e5bb732ff8638af40e112e1df98e1f537':
  Support target-specific sdk/build/tools.atree extension.
 2011-03-28 17:41:22 -07:00
Raphael
2396a0db92 resolved conflicts for merge of 9b4660a1 to master 
Change-Id: Ide155e276c6e994ad330a5ac1c2676a7acc1efed
 2011-03-25 16:21:38 -07:00
Raphael
9b4660a1c6 resolved conflicts for merge of db0d59d1 to honeycomb-plus-aosp 
Change-Id: Ie3f5b2986bc926407a7883b449441cb58ab70e30
 2011-03-25 15:13:55 -07:00
Ying Wang
507c3eac6a Merge "x86: qemu emulator is the default build target" 2011-03-25 14:30:25 -07:00
Raphael
a5b8a04086 am f0f1490d: am 57c70196: (-s ours) Merge "Merge c4d4731b4d: \'Build SDK repository\'. Do not merge." 
* commit 'f0f1490d8bccdb74afb0a59f1a748cc01e8c1502':
  Merge c4d4731b4d: 'Build SDK repository'. Do not merge.
 2011-03-24 22:43:55 -07:00
Raphael
f0f1490d8b am 57c70196: (-s ours) Merge "Merge c4d4731b4d: \'Build SDK repository\'. Do not merge." 
* commit '57c7019693a07c7b9e200d4560a0886d248bfe5b':
  Merge c4d4731b4d: 'Build SDK repository'. Do not merge.
 2011-03-24 22:39:23 -07:00
Raphael
57c7019693 Merge "Merge c4d4731b4d: 'Build SDK repository'. Do not merge." 2011-03-24 22:23:24 -07:00
Brett Chabot
f761d642e5 am 775c2912: Merge "Add more sdk lib tests to sdk build." 
* commit '775c291292716095ce7610a050e459e7b8d4d4d6':
  Add more sdk lib tests to sdk build.
 2011-03-24 19:35:08 -07:00
Brett Chabot
0ada73f39f am 27c782bf: am 50a06fe3: am dd8edfdb: Manual cherry pick of build more sdklib tests. 
* commit '27c782bfcdbec689fc7d195fe485e6f2c623e7cf':
  Manual cherry pick of build more sdklib tests.
 2011-03-24 19:07:18 -07:00
Brett Chabot
27c782bfcd am 50a06fe3: am dd8edfdb: Manual cherry pick of build more sdklib tests. 
* commit '50a06fe30e17acdb9a20c3c58f869d59d8c1b563':
  Manual cherry pick of build more sdklib tests.
 2011-03-24 19:05:35 -07:00
Brett Chabot
50a06fe30e am dd8edfdb: Manual cherry pick of build more sdklib tests. 
* commit 'dd8edfdb1ebdc5717357564fe42586d090e2bbe0':
  Manual cherry pick of build more sdklib tests.
 2011-03-24 19:02:44 -07:00
Brett Chabot
775c291292 Merge "Add more sdk lib tests to sdk build." 2011-03-24 18:57:29 -07:00
Dianne Hackborn
e4b2178329 Onward and upward! And ice cream for all! 
Change-Id: If4f5541e1bac283f4c2f43d6e73e37c124ba7684
 2011-03-24 16:59:32 -07:00
Raphael
bd0c91c8b9 Merge c4d4731b4d: 'Build SDK repository'. Do not merge. 
When the build is invoked with the fake target "sdk_repo" and
a main target of sdk, win_sdk or sdk_addon, we now create
packages in DIST_DIR that can directly be used to populate the
SDK Repository.
This is quite close to how we actually distribute the SDK.

Change-Id: I863ac8baf159432d7c95df46cba6e4f3b9122629
 2011-03-24 13:41:35 -07:00