Commit graph

1614 commits

Author SHA1 Message Date
Ying Wang
bb567df00a am 4cd9e2d9: am 06e2f72b: Support to run dex-preopt on prebuilt apks.
* commit '4cd9e2d99090502ced431b7abbff94bcc2176745':
  Support to run dex-preopt on prebuilt apks.
2011-05-26 16:31:42 -07:00
Ying Wang
4cd9e2d990 am 06e2f72b: Support to run dex-preopt on prebuilt apks.
* commit '06e2f72bc9e0f3fdbeaa9d4b00ac6fca7e0c4a7c':
  Support to run dex-preopt on prebuilt apks.
2011-05-26 16:14:32 -07:00
Ying Wang
06e2f72bc9 Support to run dex-preopt on prebuilt apks.
Change-Id: Ic7c40c502934d7588166f26bbb6e2f235d1efdea
2011-05-26 16:01:57 -07:00
Jean-Baptiste Queru
cdef404572 Merge 5d66a07d - do not merge
Change-Id: I787a6d5d5c79e7122ed506cd6d9e373e7d1049f4
2011-05-19 14:30:26 -07:00
Dianne Hackborn
477e963276 am ea4d9f55: am 22b5d621: DO NOT MERGE. We are now dev branch for Honeycomb MR2.
* commit 'ea4d9f557b20e7a4ef77e6ac0c573cf3a9a5fd3a':
  DO NOT MERGE.  We are now dev branch for Honeycomb MR2.
2011-05-11 13:49:50 -07:00
Dianne Hackborn
ea4d9f557b am 22b5d621: DO NOT MERGE. We are now dev branch for Honeycomb MR2.
* commit '22b5d62172f1563a2513dea314c037703cddf217':
  DO NOT MERGE.  We are now dev branch for Honeycomb MR2.
2011-05-11 13:35:36 -07:00
Jean-Baptiste Queru
174c15d067 Use actual numbers in version numbers.
This string is used in the browser user agent, and some
sites get confused when this isn't a dotted-number version
number into thinking that they should serve stripped down HTML.
This clears the confusion.

Change-Id: I6c959ff17c540a1f3808f19238b9eb93ba170d2e
2011-05-10 08:29:49 -07:00
Dianne Hackborn
22b5d62172 DO NOT MERGE. We are now dev branch for Honeycomb MR2.
Change-Id: Icde20a70a35fc28e168eba4809c1c011ac5265b4
2011-05-09 18:21:14 -07:00
David Turner
57a477ff2e am 6f9b7562: am d5565942: Merge "x86: Disable stack-protector until bionic is fixed"
* commit '6f9b7562e36483a7bf23833d99da6a50e57f7266':
  x86: Disable stack-protector until bionic is fixed
2011-04-26 10:24:24 -07:00
David Turner
6f9b7562e3 am d5565942: Merge "x86: Disable stack-protector until bionic is fixed"
* commit 'd5565942437e2c0787822604921d034e9df5fc5d':
  x86: Disable stack-protector until bionic is fixed
2011-04-26 01:12:03 -07:00
David Turner
d556594243 Merge "x86: Disable stack-protector until bionic is fixed" 2011-04-25 23:35:09 -07:00
Raphael Moll
009e602275 am cb6a22f5: am 2e4e3c94: Merge "Allow swtmenubar module to be buildable on Windows."
* commit 'cb6a22f591d66443c923ad917f6d40e943b476ce':
  Allow swtmenubar module to be buildable on Windows.
2011-04-15 17:28:36 -07:00
Raphael Moll
cb6a22f591 am 2e4e3c94: Merge "Allow swtmenubar module to be buildable on Windows."
* commit '2e4e3c94211fd31962e8fd1c6152932bbfdea7d5':
  Allow swtmenubar module to be buildable on Windows.
2011-04-15 14:56:41 -07:00
Raphael Moll
59ad18fa49 Allow swtmenubar module to be buildable on Windows.
Change-Id: Ia20b8dea44f79df77ba0cb0479b99af990dc5b7b
2011-04-14 21:25:44 -07:00
Ying Wang
8c425a9d7c am 479ec682: Merge "Fix "argument list too long""
* commit '479ec68292c7ba17ab8e3d849cc1f186847f5cc5':
  Fix "argument list too long"
2011-04-14 10:17:34 -07:00
Ying Wang
00985df83a Fix "argument list too long"
Bug http://b/issue?id=2718472

Change-Id: I936e660f87ec5cfbbf95e6580bade624b277228c
2011-04-14 09:59:18 -07:00
Ying Wang
bdbcc65d0e am 7c1a1247: Drop using vendor/google/etc/apns-conf.xml for eng builds.
* commit '7c1a1247f3e7110a95696671e8f71334e9b3c1b5':
  Drop using vendor/google/etc/apns-conf.xml for eng builds.
2011-04-13 10:31:50 -07:00
Ying Wang
7c1a1247f3 Drop using vendor/google/etc/apns-conf.xml for eng builds.
Bug: 4133493
Change-Id: I3eee2a5658620f480370d260b395e928bc395886
2011-04-13 10:18:12 -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
cc737a5aa3 Add NDK crtbegin_so.o and crtend_so.o if they exist.
Change-Id: Ic088a986d3810a1d313df30361145a467ba07e06
2011-04-08 14:57:36 -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
f78fb1d151 Merge "Use my-dir in a consistent way as others" 2011-03-31 14:54:56 -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
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
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
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
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
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
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
Ying Wang
7bbea4b5c1 Disable dexpreopt for unbundled build.
Cherry-picked from Honeycomb.

Change-Id: I1b8bf7faa3974f389a1f105b3397c4ceeea68885
2011-03-23 14:12:14 -07:00
Ying Wang
3fd580d4e2 Fix dependency of prebuilt target non-static Java libraries.
Cherry-picked from Honeycomb to fix a dependency issue when building
prebuilt shared library.

Change-Id: I0a9cd3835b50dcc130a5f211e89d6bd22478fd42
2011-03-23 12:01:49 -07:00
David 'Digit' Turner
440d7e1e5b am 9fe6dc2c: Merge "Support target-specific sdk/build/tools.atree extension."
* commit '9fe6dc2c17ba6113ff4031feaeea7dac0ba5d5a3':
  Support target-specific sdk/build/tools.atree extension.
2011-03-23 11:07:51 -07:00
David 'Digit' Turner
74b0c36882 Support target-specific sdk/build/tools.atree extension.
The purpose of this patch is to add the ability to specify a
target-specific extension to sdk/build/tools.atree, under the
name sdk/build/tools.$(TARGET_ARCH).atree

This is needed to move x86-specific changes out of tools.atree
in order to fix the build of internal Android branches that
don't include other x86-related changes to the build system.

Another patch, following this patch, will fix the build itself
by moving the x86-stuff to sdk/build/tools.x86.atree.

NOTE: The root cause of the problem is that tools.atree
probably shouldn't be in the public AOSP repository, but
under development/build/ instead. However, fixing this
requires more drastic changes to the build system.

Change-Id: Ie365c55527bcad38e1e5248f618e2fd5a96431a1
2011-03-23 11:20:14 +01:00
David Turner
db0d59d1b4 am b1047a99: Merge changes I00c75f37,I1fc3cb49
* commit 'b1047a99ce8b8d62ef911c5dfba7183c32e80a70':
  x86: the -mbionic flag is needed for IA builds.
  x86: qemu emulator is the default build target
2011-03-22 06:03:40 -07:00
Doug Zongker
095dbffd60 am 5d4808db: put extra recovery keys in the product definition
* commit '5d4808db1630048f6eb0610b75af01c9fc877412':
  put extra recovery keys in the product definition
2011-03-16 11:17:24 -07:00
Doug Zongker
5d4808db16 put extra recovery keys in the product definition
Change-Id: I71637cd578b24891c10171aa59406848649be703
2011-03-16 07:52:25 -07:00
Xavier Ducrohet
3509469b43 am 4216a8c9: Add the host notice file to the SDK platform-tools folder.
* commit '4216a8c94e320b7025acd6bf99bac4f9ae45c5c7':
  Add the host notice file to the SDK platform-tools folder.
2011-03-15 13:50:56 -07:00
Xavier Ducrohet
4216a8c94e Add the host notice file to the SDK platform-tools folder.
Change-Id: Id9e789fed635c6e5b43254f8ef6ec353302ca1be
2011-03-15 13:28:40 -07:00
Bruce Beare
2e8283d9bc x86: the -mbionic flag is needed for IA builds.
Change-Id: I00c75f37d7ea46b9f8ad3d7b2ff7094477ff0916
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-03-15 07:47:49 -07:00
Bruce Beare
18a130e98a x86: qemu emulator is the default build target
Change-Id: I1fc3cb491d593d3e28f90278cfc8de5d77852932
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
2011-03-15 07:47:48 -07:00