Commit graph

4347 commits

Author SHA1 Message Date
Ying Wang
91c81750f6 resolved conflicts for merge of 4d9a8556 to honeycomb-plus-aosp
Change-Id: I3914339049e3d302f8542d8ea305905eec480bbb
2011-04-12 13:14:10 -07:00
Ying Wang
4d9a8556ff am e442c136: Merge "Add NDK crtbegin_so.o and crtend_so.o if they exist."
* commit 'e442c1361a9066d7a394c080273d5f93d77979e4':
  Add NDK crtbegin_so.o and crtend_so.o if they exist.
2011-04-11 15:35:17 -07:00
Ying Wang
e442c1361a Merge "Add NDK crtbegin_so.o and crtend_so.o if they exist." 2011-04-11 10:14:51 -07:00
Ying Wang
cc737a5aa3 Add NDK crtbegin_so.o and crtend_so.o if they exist.
Change-Id: Ic088a986d3810a1d313df30361145a467ba07e06
2011-04-08 14:57:36 -07:00
Scott Main
5d587a470f am 2218c027: am 63e2c1eb: docs: add Google IO 2011 logo
* commit '2218c027117b10fd909083c8c666bebb074c2167':
  docs: add Google IO 2011 logo
2011-04-01 16:25:04 -07:00
Scott Main
2218c02711 am 63e2c1eb: docs: add Google IO 2011 logo
* commit '63e2c1eba8079caa3288a14041239f7b5018ee92':
  docs: add Google IO 2011 logo
2011-04-01 16:19:26 -07:00
Scott Main
63e2c1eba8 docs: add Google IO 2011 logo
Change-Id: I0393325205c31f588d1e1fb64dfcc2d4714bdad6
2011-04-01 15:05:12 -07:00
Bruce Beare
6ddd4ead92 x86: Disable stack-protector until bionic is fixed
Change-Id: I2862de5c1b02490197704f4578a8a91d0565eef0
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-04-01 09:09:18 -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
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
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
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
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
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
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
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
9b4660a1c6 resolved conflicts for merge of db0d59d1 to honeycomb-plus-aosp
Change-Id: Ie3f5b2986bc926407a7883b449441cb58ab70e30
2011-03-25 15:13:55 -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
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
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
Brett Chabot
dd8edfdb1e Manual cherry pick of build more sdklib tests.
Original description from open master:
-----------
Add more sdk lib tests to sdk build.

Also fix whitespace issues introduced by last commit.

Change-Id: Ifdede823b99b210ad6a48513e8522b4f660537cf
2011-03-24 11:26:29 -07:00
Raphael
21a8b2459f 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: Id08a3a55a564938dbeb6e3dd170d4a9a7153ae6e
2011-03-24 11:19:07 -07:00
Raphael Moll
0861af4ab5 am 9791e6ea: am 7e58a5fa: Merge "Merge 960ad4e095 from master_open." into honeycomb
* commit '9791e6ea170a6c6a2fc042a24d50af06c7238d83':
  Merge 960ad4e095 from master_open.
2011-03-24 10:22:53 -07:00
Raphael Moll
9791e6ea17 am 7e58a5fa: Merge "Merge 960ad4e095 from master_open." into honeycomb
* commit '7e58a5fa66f905a4524267cd1a9328d8046b3280':
  Merge 960ad4e095 from master_open.
2011-03-24 10:04:06 -07:00
Raphael Moll
7e58a5fa66 Merge "Merge 960ad4e095 from master_open." into honeycomb 2011-03-24 09:54:38 -07:00
Ying Wang
7c7fbeaf1a am 7bbea4b5: Disable dexpreopt for unbundled build.
* commit '7bbea4b5c1f053cbe428025e9f9dec0e50bcc551':
  Disable dexpreopt for unbundled build.
2011-03-24 03:36:19 -07:00
Ying Wang
bef90c0ec0 am 3fd580d4: Fix dependency of prebuilt target non-static Java libraries.
* commit '3fd580d4e29657b812d3ab3c459487689a5f2da6':
  Fix dependency of prebuilt target non-static Java libraries.
2011-03-24 03:36:11 -07:00
Brett Chabot
381dc94401 Add more sdk lib tests to sdk build.
Also fix whitespace issues introduced by last commit.

Change-Id: I579abcd5f8bc743ee7fa0206307af9347e7352dc
2011-03-23 23:04:21 -07:00