Commit Graph

671 Commits

Author SHA1 Message Date
Jean-Baptiste Queru daea3fce40 Merge "Set arm specific variables to be empty for non-arm platforms" 2010-07-09 10:44:37 -07:00
Chih-Wei Huang 0d09e587aa Set arm specific variables to be empty for non-arm platforms
These variables are useless for non-arm platforms, and will
generate misleading messages during building process.

Change-Id: I37c46ac8d30f353333803d9591b65fca24ce3fd5
2010-07-09 11:54:27 +08:00
Jean-Baptiste Queru f5f11eb01c Merge "Create systemtarball either with bz2 or gz" 2010-07-08 16:36:54 -07:00
Bruce Beare 69ef5ce4f0 Create systemtarball either with bz2 or gz
Change-Id: I64e93872942e8dcad4a894a906be7912bb6da308
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-07-08 16:36:05 -07:00
Chris Peterson 68f9303c90 update 404'd source.android.com URLs
Change-Id: If305c7f6f3ac3624568de258bdc13b142ad32cf9
2010-07-08 15:44:09 -07:00
Bruce Beare 52aac20307 Create boottarball just like systemtarball
Change-Id: I97640bc973ab1d115499878a63bff48f80b326ec
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-07-08 12:19:25 -07:00
Chih-Wei Huang 4e3c6686d1 Add $(TARGET_DEVICE_DIR)/system.prop to be a prerequisite
If $(TARGET_DEVICE_DIR)/system.prop exists, it should be
a prerequisite of $(INSTALLED_BUILD_PROP_TARGET),
as the following rules state.

Change-Id: Ie395b6f08cef198c3f5c733a5b6ae5a458335a9c
2010-07-07 13:23:26 -07:00
Raphael Moll aae60c0760 Fix to "make ddmlib ddmuilib" under Windows/Cygwin.
Needed by the latest change to sdk.git/eclipse/script/create_ddms*.sh

Change-Id: I6dfbb418cc8813c7cdfbc077705158424220724f
2010-06-30 16:00:59 -07:00
Jeff Hamilton 77dfeaed2a Switch the required host Java environment to 1.6.
The path to the Java toolchain is now explicitly
specified so no manual configuration should be
required.

Change-Id: I84abc122c557372e77e4579e9a9efe56af2b412c

The java version changed, and we made envsetup automatically find the right JAVA_HOME.

This change forces everyone to re-source envsetup.sh

Change-Id: Ieb9512d5725cca26a83debf9b0480bc20e19d5ee

Fix javadoc for Java 6.

If you don't set bootclasspath, there would be errors like:
javadoc: error - In doclet class DroidDoc, method start has thrown an exception java.lang.reflect.InvocationTargetException

Change-Id: I1b83360cb595d50577c6043d6e91b0f92e4c04d6

Avoid inheriting PRIVATE_BOOTCLASSPATH from moduels that depend on api-stubs-timestamp

The inherited value has caused build breakage on Mac build.

Change-Id: I8a1b1d6c6d411f6aaaee2d8dbd0297e3d60ab5c2

Ignore STAY_OFF_MY_LAWN when setting JAVA_HOME.

Don't check STAY_OFF_MY_LAWN in set_java_home.  That function already
refuses to update JAVA_HOME if it's set to something, which should
be sufficient for anybody who doesn't want the script to mess with it.

With this change, you can get the benefits of the 1.5/1.6 auto-selection
without having to suffer through window title changes.

Change-Id: I5cfc5d6fdf26a10b42b52925f877012c0506b9a5
2010-06-30 13:36:27 -05:00
The Android Open Source Project dcd11407e2 merge from open-source master
Change-Id: I90d465b0197034dab76505b8a68afc519be3e6e0
2010-06-28 10:35:50 -07:00
Jean-Baptiste Queru 833e62400e Update platform version strings for AOSP
Change-Id: I47d405646dd2f5179bd0db0a0b360bf5ba0069c1
2010-06-28 09:40:24 -07:00
Ying Wang 665828875b am c048c9b5: default empty tapas to TARGET_BUILD_APPS "all"
Merge commit 'c048c9b598b36dc7506a954cc0d3d80f308b1b13' into froyo-plus-aosp

* commit 'c048c9b598b36dc7506a954cc0d3d80f308b1b13':
  default empty tapas to TARGET_BUILD_APPS "all"
2010-06-24 18:00:46 -07:00
Ying Wang c048c9b598 default empty tapas to TARGET_BUILD_APPS "all"
So that "tapas" without argument won't end in makefile-could-not-load error in unbundled branch.
Also, the magic "all" apps will build only apps, not other things.

Change-Id: Iac6dd928ee4e42996147acdab31930cd4ffa1768
2010-06-24 15:13:09 -07:00
Ying Wang ca553e21f8 am 06898660: A nothing-to-do build should do nothing.
Merge commit '068986605b2afcd5e044b62f22ac6ecd5c15b519' into froyo-plus-aosp

* commit '068986605b2afcd5e044b62f22ac6ecd5c15b519':
  A nothing-to-do build should do nothing.
2010-06-21 09:06:12 -07:00
The Android Open Source Project 8b8ee713e0 merge from open-source master
Change-Id: Ia4356e797e0c9bceec56a9a5cfeab3def5ae453c
2010-06-18 13:49:35 -07:00
Jean-Baptiste Queru 979e4765e7 Change branch name to openmaster, to avoid confusion
Change-Id: Ibd0e460fd0f0c5d6fa4c1f858fbc280a0bcf7f1a
2010-06-18 08:11:13 -07:00
Ying Wang 068986605b A nothing-to-do build should do nothing.
Before this CL, ota_from_target_files is always executed even with no new change.

Change-Id: I29d6aef3c60e5b0229551a3bf22f2d31cb41f219
2010-06-17 17:52:18 -07:00
The Android Open Source Project aa90e9eac8 merge from open-source master
Change-Id: I55d36474223c79e6ab5000b2cb09b01762eb3823
2010-06-17 09:58:36 -07:00
Jean-Baptiste Queru 7ef314546b Revert "Build BUILD_MULTI_PREBUILT for the prebuilt target"
This reverts commit 9bfd697cff,
which was causing all prebuilts to be installed in all builds.

Change-Id: Ia5973b31d23bd74ec187b9e44715dea56c063efe
2010-06-17 09:30:37 -07:00
Joe Onorato 8aeb7cc461 am 2b8d2383: Merge changes I02214abd,I79e6f60e into froyo
Merge commit '2b8d2383043a2b16e53538f9ebf123bfffd27ba1' into froyo-plus-aosp

* commit '2b8d2383043a2b16e53538f9ebf123bfffd27ba1':
  Add a tapas command.
  Rename is_unbundled_app_build and UNBUNDLED_APP_BUILD to TARGET_BUILD_APPS.
2010-06-15 14:24:42 -07:00
Joe Onorato 2b8d238304 Merge changes I02214abd,I79e6f60e into froyo
* changes:
  Add a tapas command.
  Rename is_unbundled_app_build and UNBUNDLED_APP_BUILD to TARGET_BUILD_APPS.
2010-06-15 13:59:01 -07:00
Ying Wang 290f527297 am a07d37b7: Cherry-pick bug fixes from master.
Merge commit 'a07d37b79300e76da5f21f532578fcd686a74b16' into froyo-plus-aosp

* commit 'a07d37b79300e76da5f21f532578fcd686a74b16':
  Cherry-pick bug fixes from master.
2010-06-11 09:05:05 -07:00
Joe Onorato da12daf15f Add a tapas command.
(Actually there was a tapas command that just called choosecombo).

The new better tapas command is for building unbundled apps.  Run
it with one or more modules to build and optionally a build variant.

tapas [variant] App1 App2 ...

If you don't supply a build variant, it defaults to eng.

Change-Id: I02214abd0b5ad02e364fcb024e10cf6ad17a9e68
2010-06-10 18:38:37 -07:00
Joe Onorato 16fa4b290e Rename is_unbundled_app_build and UNBUNDLED_APP_BUILD to TARGET_BUILD_APPS.
Change-Id: I79e6f60e009dad3a48709962347441e4ca0c337a
2010-06-10 18:38:25 -07:00
Ying Wang a07d37b793 Cherry-pick bug fixes from master.
1. Set correct aidl_preprocess_import for LOCAL_SDK_VERSION current.
2. Set correct PRIVATE_BOOTCLASSPATH for non-empty LOCAL_SDK_VERSION.

Change-Id: Iff8e266931434863521bfa4621767bed31d31cc0
2010-06-09 12:08:07 -07:00
Ying Wang ab251d9c80 am 7a794289: Merge "Unbundle the build system." into froyo
Merge commit '7a7942899eedde3b946768a155fac3d70af5c9c3' into froyo-plus-aosp

* commit '7a7942899eedde3b946768a155fac3d70af5c9c3':
  Unbundle the build system.
2010-06-09 11:33:36 -07:00
Ying Wang 0f6f4ca54e Unbundle the build system.
Change-Id: I88912d876c3972212e8871b3e5b3b8b6d2da34d0
2010-06-09 10:26:26 -07:00
The Android Open Source Project f56e9165d9 merge from open-source master
Change-Id: I2169fb30a5bfe48501745b2141e82ad9e25971aa
2010-06-08 13:14:30 -07:00
Jean-Baptiste Queru 64947314b7 Merge "Build BUILD_MULTI_PREBUILT for the prebuilt target" 2010-06-08 10:06:47 -07:00
The Android Open Source Project 4873d8f5ca merge from open-source master
Change-Id: Id3161ac44e0eaba0184b3d2d4af43e4e40d26e90
2010-06-04 07:56:24 -07:00
Jeff Hamilton 8d09b69e2d Build host tools as 32bit on all Darwin machines.
Change-Id: I121b388056e68b787518c66a01c172bc4ffaef9b
2010-06-03 17:59:11 -05:00
Ying Wang e8ffa14900 am ba16a89d: Override LOCAL_CERTIFICATE in inherit-package.
Merge commit 'ba16a89dbd61003a3b907d0f5e8fc48fba2afcab' into froyo-plus-aosp

* commit 'ba16a89dbd61003a3b907d0f5e8fc48fba2afcab':
  Override LOCAL_CERTIFICATE in inherit-package.
2010-06-02 14:37:28 -07:00
Ying Wang ba16a89dbd Override LOCAL_CERTIFICATE in inherit-package.
it's to fix typo.

Change-Id: I9a791faa4b7b5967b5d23bfcb4caeebaef94e723
2010-06-02 13:24:36 -07:00
Ying Wang b93e03cbc9 am 52911309: Cherry-pick unbundled build changes from master
Merge commit '529113098350c026ec521258d4c6fba51f285a48' into froyo-plus-aosp

* commit '529113098350c026ec521258d4c6fba51f285a48':
  Cherry-pick unbundled build changes from master
2010-06-02 13:09:12 -07:00
Ying Wang 5291130983 Cherry-pick unbundled build changes from master
Change-Id: I82cab32f00b7b729d9b01c8e1532c8bf0ad2fb92
2010-05-26 13:39:31 -07:00
The Android Open Source Project 95f862bcb0 merge from open-source master
Change-Id: I4ea9aa2765cb634382da92ff17f5af9e2f6b4078
2010-05-14 14:35:29 -07:00
Jean-Baptiste Queru f91e9e2729 Merge "Fix "make modules" script bug under Mac OS X." 2010-05-14 14:10:50 -07:00
Ravi K Yenduri 9bfd697cff Build BUILD_MULTI_PREBUILT for the prebuilt target
Add files included as prebuilts with "BUILD_MULTI_PREBUILT"
to be installed as part of the 'prebuilt' target.

Change-Id: I2fa2dfff2637701281ab78a523c58fc46577ab75
2010-05-10 14:51:56 -07:00
The Android Open Source Project f7c634216e merge from open-source master
Change-Id: Id99b6cbc613c6c7b9d1ef79274b1c28b808a32d4
2010-05-10 11:05:12 -07:00
Dan Bornstein 6e079d7e3d am 03fb96f0: Allow for a slightly larger libwebcore, add another library to the list, correct/update a couple entries, and add a couple more comments.
Merge commit '03fb96f01eeed12ce5dc6dd8fa2e839ed497758e' into froyo-plus-aosp

* commit '03fb96f01eeed12ce5dc6dd8fa2e839ed497758e':
  Allow for a slightly larger libwebcore, add another library to the list,
2010-05-06 16:12:06 -07:00
Dan Bornstein 03fb96f01e Allow for a slightly larger libwebcore, add another library to the list,
correct/update a couple entries, and add a couple more comments.

Bug: 2651381
Change-Id: I9aaf48c3c2115b111794710bb4e959613bf22add
2010-05-06 12:43:47 -07:00
Dan Bornstein aed937ba46 am 3ca0e96a: Merge "Fixed a bunch of stuff in the prelink mappings file:" into froyo
Merge commit '3ca0e96a3a66a6c53536bf7346f616e672e2c57a' into froyo-plus-aosp

* commit '3ca0e96a3a66a6c53536bf7346f616e672e2c57a':
  Fixed a bunch of stuff in the prelink mappings file:
2010-05-05 14:37:24 -07:00
Bruce Beare 5b9f19e58f Replace arm with proper variable for CPU/ABI
Change-Id: If8594d9a2abf4d8c08b5ccea612bb700afa9e9b7
2010-05-05 11:26:04 -07:00
Dan Bornstein 7dfcfbc0d4 Fixed a bunch of stuff in the prelink mappings file:
* Added mappings for most of the libraries that didn't already
have them (as observed from my build).

* Re-canonicalized all the offsets in the mappings file,
per the official policy of keeping things megabyte-aligned.

* Added comments on each line indicating what size the library
actually appeared to be in my build (to help with future rejiggerings).

* Added a bit of documentation about the whole deal.

Even with this change, I know there are other libraries that will
still need to be included, but I think what I have here is a good
step. Also, this change only reserves room for the new libraries, but
subsequent changes (in other subprojects) are required to actually
start prelinking the new libraries. Those changes will be forthcoming
as well.

Bug: 2651381
Change-Id: I7a06382fc2b8a14bbd3261de58df3f8a31e4108e
2010-05-05 00:10:37 -07:00
The Android Open Source Project ae4e14556b merge from open-source master
Change-Id: I3d24628d38c99369f242733d9089d7c5669a4623
2010-05-03 16:11:04 -07:00
Jean-Baptiste Queru 045d4af72d Adapt to new location of libcore
Change-Id: Ibabfe907f00522c1966ddc333352eaea2bdcb5bd
2010-04-30 13:22:56 -07:00
Evan JIANG f380692430 Fix "make modules" script bug under Mac OS X.
For Mac OS uses BSD sed, it doesn't support "\n". Then, "make modules"
command cannot work correctly under Mac OS. Using tr command to replace
sed command, it has the same behavior under both Mac OS and Linux.

Change-Id: I29e044cc66bf24f6459cbb33164fd9f55f772e3c
2010-04-28 16:13:28 -07:00
The Android Open Source Project cd0bd8011b merge from open-source master
Change-Id: Ie49d1b19914fcfefedfdfc070800426d4b13dd46
2010-04-28 15:55:08 -07:00
Raphael Moll bfa25878f9 Remove obsolete machine-setup.html reference.
Bug 1231

Change-Id: I629361cf5dddc9d0fbf493e016f1aaf2a50b6935
2010-04-28 14:30:44 -07:00
Raphael 9ca1628e3f Support building Windows SDK under Linux.
- envsetup.mk & config.mk: we define a new BUILD_OS and a minimal set
of things like BUILD_OUT to be able to use some local tools when
doing cross-compilation. This allows us to use the Linux version of
ACP when cross-compiling the tools to Windows.

- Makfile: include windows_sdk.mk when needed to build a Windows SDK.

- main.mk: support a win_sdk target (e.g. PRODUCT-sdk-win_sdk)

(Merge master Change I9d08d0df)
2010-04-23 13:17:23 -07:00