Commit Graph

3388 Commits

Author SHA1 Message Date
Raphael a5b8a04086 am f0f1490d: am 57c70196: (-s ours) Merge "Merge c4d4731b4dd306b74b9e2245b4983b6b3c5b866e: \'Build SDK repository\'. Do not merge."
* commit 'f0f1490d8bccdb74afb0a59f1a748cc01e8c1502':
  Merge c4d4731b4dd306b74b9e2245b4983b6b3c5b866e: 'Build SDK repository'. Do not merge.
2011-03-24 22:43:55 -07:00
Raphael f0f1490d8b am 57c70196: (-s ours) Merge "Merge c4d4731b4dd306b74b9e2245b4983b6b3c5b866e: \'Build SDK repository\'. Do not merge."
* commit '57c7019693a07c7b9e200d4560a0886d248bfe5b':
  Merge c4d4731b4dd306b74b9e2245b4983b6b3c5b866e: 'Build SDK repository'. Do not merge.
2011-03-24 22:39:23 -07:00
Raphael 57c7019693 Merge "Merge c4d4731b4dd306b74b9e2245b4983b6b3c5b866e: '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 775c291292 Merge "Add more sdk lib tests to sdk build." 2011-03-24 18:57:29 -07:00
Raphael bd0c91c8b9 Merge c4d4731b4dd306b74b9e2245b4983b6b3c5b866e: '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 c4d4731b4dd306b74b9e2245b4983b6b3c5b866e: '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
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
Brett Chabot 8c2d872a02 am 327d133f: Merge "Add ddmlib-tests.jar to sdk build."
* commit '327d133fce8928f1474c52a07447679e1e76ffa0':
  Add ddmlib-tests.jar to sdk build.
2011-03-23 20:00:31 -07:00
Brett Chabot 327d133fce Merge "Add ddmlib-tests.jar to sdk build." 2011-03-23 19:22:25 -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 9fe6dc2c17 Merge "Support target-specific sdk/build/tools.atree extension." 2011-03-23 10:35:13 -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
Brett Chabot 06f180f764 Add ddmlib-tests.jar to sdk build.
Change-Id: Ifc7cc59726066f869504a338d3025bffdeaa6785
2011-03-22 20:38:57 -07: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
David Turner b1047a99ce Merge changes I00c75f37,I1fc3cb49
* changes:
  x86: the -mbionic flag is needed for IA builds.
  x86: qemu emulator is the default build target
2011-03-22 05:50:56 -07:00
David Turner 86ed1dbaa7 am 75724826: Merge "sdk: Add pc-bios files for IA qemu emulator"
* commit '757248269bfbe2390a2d04e1d69fb5a0742f3025':
  sdk: Add pc-bios files for IA qemu emulator
2011-03-21 18:09:49 -07:00
David Turner 757248269b Merge "sdk: Add pc-bios files for IA qemu emulator" 2011-03-21 15:23:17 -07:00
Ying Wang eb68729bf3 am 080ed92e: Merge "Close inherited PIPE before doing work" into gingerbread
* commit '080ed92e77fc7c24ca3bac1a1dc06057390bfdb8':
  Close inherited PIPE before doing work
2011-03-15 18:21:20 -07:00
Ying Wang 080ed92e77 Merge "Close inherited PIPE before doing work" into gingerbread 2011-03-15 17:49:05 -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 960ad4e095 sdk: Add pc-bios files for IA qemu emulator
Change-Id: Ia919ff57295cd020810989f241da713210bc8720
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-03-15 07:47:48 -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
David 'Digit' Turner e9b1d0eee7 am f8f95fc8: Merge "Allow win_sdk build with USE_CCACHE=1"
* commit 'f8f95fc8b1a1eb19812fc55b230da3bfbe5272e5':
  Allow win_sdk build with USE_CCACHE=1
2011-03-15 03:59:52 -07:00
David 'Digit' Turner f8f95fc8b1 Merge "Allow win_sdk build with USE_CCACHE=1" 2011-03-15 03:31:19 -07:00
David 'Digit' Turner 55aad08663 Allow win_sdk build with USE_CCACHE=1
This patch allows the Window sdk build (lunch sdk-eng; make win_sdk)
to work properly when USE_CCACHE is defined in the environment.

There is no Windows ccache prebuilt, but since we're cross-compiling
from Linux, detect it and use the linux prebuilt binary instead.

Note: Depends on https://review.source.android.com//#change,21755
      for a complete solution to the problem.

Change-Id: I0b1b59efae86ee7114225258c9ecf9f257913347
2011-03-15 01:01:32 +01:00
Chih-Wei Huang e73c4bbc50 Use my-dir in a consistent way as others
Change-Id: I3fd0cc58b48d621b431d7dd05fb689c1917b530d
2011-03-11 11:48:48 +08:00
Raphael Moll 8755e2b2c2 am e84739e9: Merge "Fix find-jdk-tools-jar to be cygwin-friendly."
* commit 'e84739e942d19955248e1fc1ce966d56543eaf0e':
  Fix find-jdk-tools-jar to be cygwin-friendly.
2011-03-10 12:46:12 -08:00
Raphael Moll e84739e942 Merge "Fix find-jdk-tools-jar to be cygwin-friendly." 2011-03-10 12:29:20 -08:00
Ying Wang 123995f9e1 am be188caf: Dist build.prop in sdk builds.
* commit 'be188cafd21c7356cc33ae042661b682d0536e8b':
  Dist build.prop in sdk builds.
2011-03-09 16:47:27 -08:00
Raphael Moll 4de32c69c7 Fix find-jdk-tools-jar to be cygwin-friendly.
Change-Id: I9cf2035026725fd1ba8a014b484262ed1acc1df4
2011-03-08 14:29:25 -08:00
Ed Heyl f50b9c4c85 resolved conflicts for merge of 24297cab to gingerbread-plus-aosp
Change-Id: Ia10a4601b7156f6379d1663d811af45103ff81ff
2011-03-08 14:12:25 -08:00
Ying Wang be188cafd2 Dist build.prop in sdk builds.
Change-Id: Id694a11fb644d21a69c89aad0bd6b0fa85aab32d
2011-03-08 14:05:51 -08:00
Ed Heyl 24297cabf4 Merge "version bump for new release (please don't merge)" into gingerbread 2011-03-08 12:35:20 -08:00
Ed Heyl 3c83a5aeb9 version bump for new release (please don't merge)
Change-Id: I94081a1288da434811a1ddaa8a7b7b5da13d9341
2011-03-07 18:08:24 -08:00
David Turner b9c627c6a0 am 0683a773: Merge "x86: Use GCC 4.4.3"
* commit '0683a77348f2a0a529a8e2bcfdf4b6dc6b4c5f5b':
  x86: Use GCC 4.4.3
2011-03-07 13:35:02 -08:00
Ying Wang 582222190f am 9238d44c: Only copy once even if the first matched src:dest pair appears more than once.
* commit '9238d44c92b355bac6b7a13b23f298336338bf3d':
  Only copy once even if the first matched src:dest pair appears more than once.
2011-03-04 17:13:08 -08:00
Ying Wang 0a1f3236e3 am a73b6561: Drop support for target files with no recovery.fstab.
* commit 'a73b6561cee39ad416f4af327dbe72ec565d2423':
  Drop support for target files with no recovery.fstab.
2011-03-04 17:13:04 -08:00
David Turner 0683a77348 Merge "x86: Use GCC 4.4.3" 2011-03-04 16:39:26 -08:00
Ying Wang 9238d44c92 Only copy once even if the first matched src:dest pair appears more than once.
Change-Id: I476923007dac1174371d6e6526d72182eb6c7243
2011-03-04 15:10:15 -08:00
Ying Wang a73b6561ce Drop support for target files with no recovery.fstab.
Change-Id: I099298cfffc2546975732a3bf0df60f96ccbdac4
Meanwhile don't build the ota and update zip files if no recovery.fstab
found.
2011-03-04 14:42:13 -08:00
David Turner 51de64377b am 9edd4fa0: Merge "x86: sdk_x86 build target"
* commit '9edd4fa0a629e178382bacf11bd8875ae826d651':
  x86: sdk_x86 build target
2011-03-04 12:39:52 -08:00
David Turner 9edd4fa0a6 Merge "x86: sdk_x86 build target" 2011-03-04 12:25:47 -08:00
David Turner dfa82c438f am faa68200: Merge "x86: Add in the VirtualBox emulator as a separate build target"
* commit 'faa68200661eea15f5b3962386d325609e1f90a8':
  x86: Add in the VirtualBox emulator as a separate build target
2011-03-04 11:46:14 -08:00
David Turner faa6820066 Merge "x86: Add in the VirtualBox emulator as a separate build target" 2011-03-04 11:41:02 -08:00
Wink Saville 243d9ae28c am 4d67e916: am d09b2e55: Merge "WAPPushManager, WAP Push over SMS message handler"
* commit '4d67e91644ea78b5209de50355ba812a73b519f8':
  WAPPushManager, WAP Push over SMS message handler
2011-03-01 13:16:09 -08:00