Commit graph

1136 commits

Author SHA1 Message Date
Ying Wang
fdc3192e68 resolved conflicts for merge of bd0c91c8 to gingerbread-plus-aosp
Change-Id: Ia4d8719337f84927f96a162b97df8a8bc62630e1
2011-03-31 17:00:13 -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
Iliyan Malchev
b375e71d30 build: remove prelinker build build system
This patch removes support for prelinking from the build system.  By now, the
prelinker has outlived its usefulness for several reasons.  Firstly, the
speedup that it afforded in the early days of Android is now nullified by the
speed of hardware, as well as by the presence of Zygote.  Secondly, the space
savings that come with prelinking (measued at 17MB on a recent honeycomb
stingray build) are no longer important either.  Thirdly, prelinking reduces
the effectiveness of Address-Space-Layout Randomization.  Finally, since it is
not part of the gcc suite, the prelinker needs to be maintained separately.

The patch deletes apriori, soslim, lsd, isprelinked, and iself from the source
tree.  It also removes the prelink map.

LOCAL_PRELINK_MODULE becomes a no-op.  Individual Android.mk will get cleaned
separately.  Support for prelinking will have to be removed from the recovery
code and from the dynamic loader as well.

Change-Id: I5839c9c25f7772d5183eedfe20ab924f2a7cd411
2011-03-12 14:59:46 -08:00
Ying Wang
f8a7ff191a resolved conflicts for merge of 123995f9 to honeycomb-plus-aosp
Change-Id: I3665ae5778120499117806e7301a7be6dfff91cf
2011-03-09 17:02:35 -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
Ying Wang
be188cafd2 Dist build.prop in sdk builds.
Change-Id: Id694a11fb644d21a69c89aad0bd6b0fa85aab32d
2011-03-08 14:05:51 -08:00
Raphael
c4d4731b4d Build SDK repository
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: Ie7e0f789bafd73d5ee2461349155a6e562e2edd9
2011-02-16 20:27:59 -08:00
Raphael Moll
16166e5727 am 5c6069d6: am ed191898: am a15717c9: am 6b7b53cb: Merge "SDK: Enable "make sdk/common" under Windows"
* commit '5c6069d632b3019c74de57b5d89a4e90d2b59759':
  SDK: Enable "make sdk/common" under Windows
2011-02-03 18:07:50 -08:00
Raphael Moll
5c6069d632 am ed191898: am a15717c9: am 6b7b53cb: Merge "SDK: Enable "make sdk/common" under Windows"
* commit 'ed19189877a3a380074e8e76969ef23689cec8fd':
  SDK: Enable "make sdk/common" under Windows
2011-02-03 11:45:21 -08:00
Raphael Moll
ed19189877 am a15717c9: am 6b7b53cb: Merge "SDK: Enable "make sdk/common" under Windows"
* commit 'a15717c9905e32f2724645e3734567c40d8d3eb0':
  SDK: Enable "make sdk/common" under Windows
2011-02-03 11:42:34 -08:00
Raphael Moll
192d1ef6d7 SDK: Enable "make sdk/common" under Windows
Change-Id: Id9cba159f434fb18f6e3b648954b3f8ddb580dc0
2011-02-02 15:59:46 -08:00
Brian Swetland
678c7ac997 am d7798a7e: fix TINY ANDROID yet again...
* commit 'd7798a7e1b3241c49d7c8325cf14ac608350b719':
  fix TINY ANDROID yet again...
2011-02-02 15:23:20 -08:00
Brian Swetland
d7798a7e1b fix TINY ANDROID yet again...
Change-Id: If52e1387c590be5ef467280ab2d1b56b8a823cd0
2011-02-02 15:20:50 -08:00
Ying Wang
0864d01001 am 9bc858c4: am 9c0f3e35: Build only userdata.img.
* commit '9bc858c4fd765366a64cfe2021b8694b4aac82f8':
  Build only userdata.img.
2011-02-01 16:39:03 -08:00
Ying Wang
9c0f3e3551 Build only userdata.img.
Use build command like:
$make -j16 showcommands userdataimage dist TARGET_PRODUCT=trygon_with_data_preloaded TARGET_BUILD_VARIANT=user

Change-Id: I964490e03090c3696d1595c92363273e35cfaed7
2011-02-01 14:59:12 -08:00
Ying Wang
3d85bbd288 Merge "Add modifier goal incrementaljavac" 2011-01-24 10:59:15 -08:00
Brian Swetland
7cc2440994 make TINY_ANDROID build without the presence of frameworks/* and development/*
Change-Id: I795e27a9ce837b193c6d8d0516e2f523c17214e2
2011-01-23 18:56:08 -08:00
Brian Swetland
72bf09d333 tiny android: include su
Change-Id: Ib8162c0f8171114ffafcac48d482fd3acd5d5956
2011-01-23 17:06:58 -08:00
Ying Wang
015edd2c1b Add modifier goal incrementaljavac
With "incrementaljavac" on your make command line, you will recompile
only Java source files that have been changed since last build.
Nothing is changed if "incrementaljavac" is not among your make goals.

Change-Id: Iae591459827df81ac91e95292464db5e9828343a
2011-01-21 17:49:30 -08:00
Brian Swetland
a7600364fe fix tiny android build
Change-Id: Ifa6cda67f54969588b5c4e9f900ac2d4ba607e71
Signed-off-by: Brian Swetland <swetland@google.com>
2011-01-20 15:34:39 -08:00
Raphael
d3e6fcbe6c Add llvm-rs-cc to the tools buildable under Windows.
To be able to "make llvm-rs-cc" as a Windows SDK tool, we
first need to let the build system know which folders can be
built.

Once this is done, building can be done using the mingw32
package to do cross-compiling under Linux:
  $ USE_MINGW=1 make llvm-rs-cc

Change-Id: I5538f4c52c74dad18dd50b59c9bdbcd6de3fd191
2011-01-12 13:33:04 -08:00
Ying Wang
228fcef025 Change phony target name dist_libraries to dist_files.
Any module that does not build in apps_only build should not dist for the
default goal "droid" -- they sould dist for "dist_files" instead.

Change-Id: I8696f1ea803fbd8554ec03352e0ef369f5d7be0d
2010-12-08 20:07:48 -08:00
Jean-Baptiste Queru
493ab6449c am ce5d7e04: am 7fbeda2b: Merge "Adding all\' to INTERNAL_MODIFIER_TARGETS to fix make all\'"
* commit 'ce5d7e04a8550724b3c7dc54f84e68fbcbdb3fcb':
  Adding `all' to INTERNAL_MODIFIER_TARGETS to fix `make all'
2010-11-23 10:54:22 -08:00
Jean-Baptiste Queru
ce5d7e04a8 am 7fbeda2b: Merge "Adding all\' to INTERNAL_MODIFIER_TARGETS to fix make all\'"
* commit '7fbeda2b1ed2872b2e2ab2f7faf386a3755502df':
  Adding `all' to INTERNAL_MODIFIER_TARGETS to fix `make all'
2010-11-23 10:51:44 -08:00
Magnus Bäck
6ba4ebf272 Adding all' to INTERNAL_MODIFIER_TARGETS to fix make all'
Commit e334d255 added the `all' pseudo-goal (aka internal modifier
target) to have make dex all Java modules. Unfortunately the new
pseudo-goal wasn't added to INTERNAL_MODIFIER_TARGETS so no actual
phony goal was added, resulting in the obvious

   make: *** No rule to make target `all'.  Stop.

error message when running `make all'. This commit changes
INTERNAL_MODIFIER_TARGETS to also include `all' so that the
pseudo-goal is treated just like `showcommands' and `checkbuild'.

Change-Id: I7905c1e27d1b17bdc1b4331744bf06e18937406f
2010-11-23 10:36:50 -08:00
Bruce Beare
885b6b99d3 Correct makefile test for stagefright build
Change-Id: Ia79b97d43e3fad82491e7d6197ffef2e764a63e3
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2010-11-19 10:45:11 -08:00
Ying Wang
cc6c8cb856 am 92cc4c07: am b26a65b5: Merge "Restrict make version to 3.81"
* commit '92cc4c07475bd77ffb058f430c27b04f8cc9dfef':
  Restrict make version to 3.81
2010-11-19 10:27:47 -08:00
Ying Wang
92cc4c0747 am b26a65b5: Merge "Restrict make version to 3.81"
* commit 'b26a65b59ff5ed777accaf34ac06ab6a86dc37c6':
  Restrict make version to 3.81
2010-11-19 10:24:57 -08:00
Kenny Root
824d7b2f02 Fix typo in ALL_PREBUILT error message
Change-Id: Ib59047e5c63950c84a6518a91ab6e5060c46ff21
2010-11-18 14:27:00 -08:00
Ying Wang
4f9269ef75 Restrict make version to 3.81
Bug: 3209290
It turns out that gmake 3.82 on Mac OSX crashes with segmentation fault
at some point.

Change-Id: I7b632abe1cafc5f0ff2ea45611d8ccf0aa3f976a
2010-11-18 11:18:52 -08:00
Xavier Ducrohet
8d458ab320 am f5f81fc7: am 01a9840b: Merge "Rename layoutlib_utils into ide_common"
* commit 'f5f81fc75e6f4ab598fab8876efc892243287def':
  Rename layoutlib_utils into ide_common
2010-11-11 15:01:52 -08:00
Xavier Ducrohet
f5f81fc75e am 01a9840b: Merge "Rename layoutlib_utils into ide_common"
* commit '01a9840ba7545d9175575cc3d95b2584b2dee31c':
  Rename layoutlib_utils into ide_common
2010-11-11 14:59:57 -08:00
Xavier Ducrohet
2e5ee27e9e Rename layoutlib_utils into ide_common
Change-Id: Iaa8275881dd1ee7d41c30f8b0d481253a6635271
2010-11-11 12:44:16 -08:00
Daniel Sandler
9566122c9d make help: prints a handy list of useful targets
A small step to making the platform build environment more
self-documenting.

Change-Id: I8f6cebe6cbd4cf89736da23e9d0d2a257ea422ee
2010-10-28 15:40:06 -04:00
Ying Wang
7522f04a4b Verify PRODUCT_* are not modified by Android.mks, but allow them to be read only.
Bug: 3076955
Change-Id: I7ddcc5b9d6325d3a3c63f952f97034ddf223630a
2010-10-11 16:33:37 -07:00
Joe Onorato
64cf5aa667 Revert "Enforce that PRODUCT_ variables aren't modified by module makefiles"
This reverts commit 95e743a6c0.
2010-10-08 17:01:50 -04:00
Jean-Baptiste Queru
95e743a6c0 Enforce that PRODUCT_ variables aren't modified by module makefiles
This eliminates one of the way a module could insert itself into
a build without going through a product definition file.

Change-Id: I1d537764d73c52ceaec96b64b6b6925e2f6a8d8e
2010-10-07 16:08:46 -07:00
Dima Zavin
531f524256 core: Make fake packages have real installed files for proper dependencies
Change-Id: I3145440eea0fbbd8ba22a2b3b0511f4c18f90eca
Signed-off-by: Dima Zavin <dima@android.com>
2010-09-27 17:37:59 -07:00
Ying Wang
e874e23a3c resolved conflicts for merge of dc45f86a to master
Change-Id: Icb49e58c1275c160715ba26d238337213e3877fe
2010-09-27 12:05:56 -07:00
Ying Wang
dc45f86af8 am 02352378: Remove emulator-based dexpreopt logic from the build system.
Merge commit '0235237805991b48831dc8add072a50c478b2fcb' into gingerbread-plus-aosp

* commit '0235237805991b48831dc8add072a50c478b2fcb':
  Remove emulator-based dexpreopt logic from the build system.
2010-09-27 11:52:45 -07:00
Ying Wang
0235237805 Remove emulator-based dexpreopt logic from the build system.
Change-Id: Ic96cbd1ebb9fa65aa85bf77f18a31913625d7e1c
2010-09-27 10:37:25 -07:00
Jean-Baptiste Queru
49ce545ad5 Disable this check that was submitted by mistake.
There's still one device that doesn't build with this check enabled.

Change-Id: I962afe9c739df15e77ead30311c34be411674f53
2010-09-26 15:03:43 -07:00
Dima Zavin
c2901aa513 core: don't add file deps for modules without any installed files
Change-Id: I0acadb2ce287a1657d29dc787bd9b1c2f95aa918
Signed-off-by: Dima Zavin <dima@android.com>
2010-09-26 14:58:28 -07:00
Jean-Baptiste Queru
0944771fb0 Issue an error when unknown files are added to ALL_PREBUILT
Change-Id: I72b086ed7a3ad04227ce429f4d367b726d573432
2010-09-26 13:16:35 -07:00
Ying Wang
3efd768a0d resolved conflicts for merge of 9f28f0d7 to master
Change-Id: I8fbf8846fcb41ca6cb5f3e362484ec895fe7f4aa
2010-09-22 17:19:11 -07:00
Ying Wang
9f28f0d76e am e7874c43: Integrate dexpreopt into the build system.
Merge commit 'e7874c430895b9a4e631c89f1e7729da9264d167' into gingerbread-plus-aosp

* commit 'e7874c430895b9a4e631c89f1e7729da9264d167':
  Integrate dexpreopt into the build system.
2010-09-22 16:57:01 -07:00
Ying Wang
e7874c4308 Integrate dexpreopt into the build system.
Change-Id: Id67f85d0f5c8674f5bc22e431114ca73625811ef
2010-09-22 16:51:53 -07:00
Ying Wang
1613f4ff1e resolved conflicts for merge of 554402f7 to master
Change-Id: Ia72f326ca91311c9eaa05aa4f5a134a60171cafb
2010-09-22 14:11:49 -07:00
Jesse Wilson
fed45d859a am 77070aa7: am ce7d5023: Turn dalvikvm host builds on by default when linux is the host OS.
Merge commit '77070aa757806d1617d707db4d2bd7931b2353fc'

* commit '77070aa757806d1617d707db4d2bd7931b2353fc':
  Turn dalvikvm host builds on by default when linux is the host OS.
2010-09-22 13:53:41 -07:00
Ying Wang
554402f76d am 38a3161d: String literal change.
Merge commit '38a3161dc7f5fec81df9412bc202c3962c74535d' into gingerbread-plus-aosp

* commit '38a3161dc7f5fec81df9412bc202c3962c74535d':
  String literal change.
2010-09-22 13:14:49 -07:00
Ying Wang
38a3161dc7 String literal change.
Change-Id: Ic1289ee3abb184b4617aa42c28e6eca812600463
2010-09-22 13:06:34 -07:00
Jesse Wilson
77070aa757 am ce7d5023: Turn dalvikvm host builds on by default when linux is the host OS.
Merge commit 'ce7d5023c3df4c16ae395d64d51dd8345e40a39e' into gingerbread-plus-aosp

* commit 'ce7d5023c3df4c16ae395d64d51dd8345e40a39e':
  Turn dalvikvm host builds on by default when linux is the host OS.
2010-09-22 11:55:29 -07:00
Jesse Wilson
ce7d5023c3 Turn dalvikvm host builds on by default when linux is the host OS.
Previously host builds were only enabled under user and user-debug
builds. This will make it easier for Androids to find out if they've
inadvertently broken host compatibility in native code.

Change-Id: Id1f2d5e189c4c1b6462fe03bab1b0f75e98a599c
2010-09-22 11:39:18 -07:00
Ying Wang
b368bba41c Enforce 64-bit build environment
We will only support 64-bit build environment beyond froyo/2.2 .

Change-Id: I71eb1230bf0bc12ccde2aeda6255db6a87540437
2010-09-22 11:02:09 -07:00
Ying Wang
0153446b79 am 6674ec30: am 659adc0b: Merge "Change "make PRODUCT-XXX-tests" to build only tests-build-target" into gingerbread
Merge commit '6674ec30bb92337e3bccb67bca53555a798a493f'

* commit '6674ec30bb92337e3bccb67bca53555a798a493f':
  Change "make PRODUCT-XXX-tests" to build only tests-build-target
2010-09-15 17:53:22 -07:00
Ying Wang
6674ec30bb am 659adc0b: Merge "Change "make PRODUCT-XXX-tests" to build only tests-build-target" into gingerbread
Merge commit '659adc0b54e40b3b194c84ad4ac8d2e775276e60' into gingerbread-plus-aosp

* commit '659adc0b54e40b3b194c84ad4ac8d2e775276e60':
  Change "make PRODUCT-XXX-tests" to build only tests-build-target
2010-09-15 11:58:41 -07:00
Ying Wang
db2cb63612 Change "make PRODUCT-XXX-tests" to build only tests-build-target
Change-Id: Ib1a1a7b09ea6f1c3eea84394dcd6e3ebcda81e1a
2010-09-14 16:32:12 -07:00
Joe Onorato
8dc8faaaea Add option to fail when Android.mk files change PRODUCT_* variables.
It's turned off for now.

Change-Id: I0b5a3ce5fdc7693c8ebd870312f0c2e13fdb8b22
2010-09-14 13:13:27 -04:00
Dan Bornstein
29ff8c85c1 am 3177afa8: am ca917dc2: Merge "Enable WITH_HOST_DALVIK for "user" builds on Linux." into gingerbread
Merge commit '3177afa8177d8b31dd6bd160816a11fedeec7e07'

* commit '3177afa8177d8b31dd6bd160816a11fedeec7e07':
  Enable WITH_HOST_DALVIK for "user" builds on Linux.
2010-09-08 14:38:03 -07:00
Dan Bornstein
3177afa817 am ca917dc2: Merge "Enable WITH_HOST_DALVIK for "user" builds on Linux." into gingerbread
Merge commit 'ca917dc2b2140b9fc4e331f94907cd27c8b6a91f' into gingerbread-plus-aosp

* commit 'ca917dc2b2140b9fc4e331f94907cd27c8b6a91f':
  Enable WITH_HOST_DALVIK for "user" builds on Linux.
2010-09-08 14:34:21 -07:00
Dan Bornstein
f13bdd94dc Enable WITH_HOST_DALVIK for "user" builds on Linux.
Bug: 2497274
Change-Id: I636895b52c82f301f8c288ae670b34e1dbf32cc5
2010-09-08 11:19:27 -07:00
Joe Onorato
f06675e2a4 am 4b1e2245: am c5b8d4ce: Merge "The old clean target had bit rotted." into gingerbread
Merge commit '4b1e2245857d696aa0dfcd7a163c6d04025c74f6'

* commit '4b1e2245857d696aa0dfcd7a163c6d04025c74f6':
  The old clean target had bit rotted.
2010-09-03 10:36:46 -07:00
Joe Onorato
4b1e224585 am c5b8d4ce: Merge "The old clean target had bit rotted." into gingerbread
Merge commit 'c5b8d4ceb63909e5f0811fa80dca205996fd8644' into gingerbread-plus-aosp

* commit 'c5b8d4ceb63909e5f0811fa80dca205996fd8644':
  The old clean target had bit rotted.
2010-09-03 10:28:00 -07:00
Joe Onorato
dfc5e0cb7b The old clean target had bit rotted.
Clean and clobber are now the same thing.

Change-Id: I4873d40496b16e13689e22c48cff1fecdffb8b40
2010-09-03 13:25:11 -04:00
Andreas Huber
3e8f987889 am aeb2bbc1: am 200f2598: Build without OpenCore by default, remove obsolete opt-in to stagefright.
Merge commit 'aeb2bbc140acfbaa8279f704fd7fc3f4d08c9486'

* commit 'aeb2bbc140acfbaa8279f704fd7fc3f4d08c9486':
  Build without OpenCore by default, remove obsolete opt-in to stagefright.
2010-08-30 13:30:29 -07:00
Andreas Huber
aeb2bbc140 am 200f2598: Build without OpenCore by default, remove obsolete opt-in to stagefright.
Merge commit '200f25984ccc8a9e5fc13bfbcde22c17bc80d410' into gingerbread-plus-aosp

* commit '200f25984ccc8a9e5fc13bfbcde22c17bc80d410':
  Build without OpenCore by default, remove obsolete opt-in to stagefright.
2010-08-30 13:06:50 -07:00
Andreas Huber
200f25984c Build without OpenCore by default, remove obsolete opt-in to stagefright.
Change-Id: I6e08d2136147f4e279f8a5b2b3837e4317faf27c
related-to-bug: 2941153
2010-08-30 12:48:03 -07:00
Raphael Moll
f3e7e04f70 am 2a1873b0: am 6ba4b59c: SDK: add hierarchyviewer2 to windows target list.
Merge commit '2a1873b09c73700d4339f379f4389b26beb81173'

* commit '2a1873b09c73700d4339f379f4389b26beb81173':
  SDK: add hierarchyviewer2 to windows target list.
2010-08-28 17:39:23 -07:00
Raphael Moll
2a1873b09c am 6ba4b59c: SDK: add hierarchyviewer2 to windows target list.
Merge commit '6ba4b59c9067b747ab2a4c85621e656c4d4614e3' into gingerbread-plus-aosp

* commit '6ba4b59c9067b747ab2a4c85621e656c4d4614e3':
  SDK: add hierarchyviewer2 to windows target list.
2010-08-28 17:31:31 -07:00
Raphael Moll
6ba4b59c90 SDK: add hierarchyviewer2 to windows target list.
Change-Id: I282173ab10930a716861f3774804d3d8484a71f3
2010-08-28 15:03:40 -07:00
Jean-Baptiste Queru
b139a445d6 am 5f0df7a9: Manual merge
Merge commit '5f0df7a95bb6b7bbbd6fb0062bef915873f9e5a1'

* commit '5f0df7a95bb6b7bbbd6fb0062bef915873f9e5a1':
  Add new variable TARGET_SHELL := ash (default; or mksh)
2010-08-25 09:59:53 -07:00
Jean-Baptiste Queru
5f0df7a95b Manual merge
Change-Id: I81dd98ba150e936b675ff2323994a1e381512332
2010-08-25 09:52:07 -07:00
Thorsten Glaser
2213aab8b9 Add new variable TARGET_SHELL := ash (default; or mksh)
Besides that, add enough magic to build everything tagged
as "shell_$(TARGET_SHELL)" and permit ash/mksh as not unusual

Change-Id: I36c0590ba49f45251d24dc179cb27c8368c3662a
2010-08-24 18:08:47 -07:00
Raphael Moll
839c058dd0 am ddf08caa: am ddeb150d: Add easymock for list of Windows SDK targets.
Merge commit 'ddf08caafa9644a502c0804450b9b6572010eb0d'

* commit 'ddf08caafa9644a502c0804450b9b6572010eb0d':
  Add easymock for list of Windows SDK targets.
2010-08-17 07:51:31 -07:00
Raphael Moll
ddf08caafa am ddeb150d: Add easymock for list of Windows SDK targets.
Merge commit 'ddeb150d8d300806de576430444bf1a84ff35e96' into gingerbread-plus-aosp

* commit 'ddeb150d8d300806de576430444bf1a84ff35e96':
  Add easymock for list of Windows SDK targets.
2010-08-17 07:48:46 -07:00
Raphael Moll
ddeb150d8d Add easymock for list of Windows SDK targets.
Also correctly sorted the windows sdk target list.

Change-Id: I4742a0b98ece8e0693a6f346a1f09595253d65c1
2010-08-16 11:17:21 -07:00
Ying Wang
84a5ba03b4 am b96e8a8c: am d9dea715: am d5c217ac: Merge "add phony target "all_modules" and use it as make goal for "mm"/"mmm"" into froyo
Merge commit 'b96e8a8cc629c3e3a196263cc548bd55824e4ade'

* commit 'b96e8a8cc629c3e3a196263cc548bd55824e4ade':
  add phony target "all_modules" and use it as make goal for "mm"/"mmm"
2010-07-22 11:24:38 -07:00
Ying Wang
b96e8a8cc6 am d9dea715: am d5c217ac: Merge "add phony target "all_modules" and use it as make goal for "mm"/"mmm"" into froyo
Merge commit 'd9dea715e5841028b1a30aa3f357b05c9de3e8c7' into gingerbread-plus-aosp

* commit 'd9dea715e5841028b1a30aa3f357b05c9de3e8c7':
  add phony target "all_modules" and use it as make goal for "mm"/"mmm"
2010-07-22 11:06:26 -07:00
Ying Wang
d9dea715e5 am d5c217ac: Merge "add phony target "all_modules" and use it as make goal for "mm"/"mmm"" into froyo
Merge commit 'd5c217aca18726f0ed9f2ea034f750620d4bdf7d' into gingerbread

* commit 'd5c217aca18726f0ed9f2ea034f750620d4bdf7d':
  add phony target "all_modules" and use it as make goal for "mm"/"mmm"
2010-07-22 10:58:14 -07:00
Ying Wang
0188414bc6 add phony target "all_modules" and use it as make goal for "mm"/"mmm"
So that mm/mmm don't depend on phony target "files", which brings in
unwanted files for apps-only build.
Also allow "dist" for mmm.
Bug: http://b/issue?id=2811503

Change-Id: I2c0794aebd1d171d8a0f44eb8cda67855704d6bd
2010-07-20 16:18:16 -07:00
Ying Wang
ad8aec94fa resolved conflicts for merge of 6c56dd64 to master
Change-Id: If806a737c5cc46cd4545788dfa991cdeab488213
2010-07-13 21:08:38 -07:00
Ying Wang
6c56dd64b2 am a9b02f0b: resolved conflicts for merge of a6bed2f7 to gingerbread
Merge commit 'a9b02f0bfeba5b3df1d6e74e7a695c5d357f2a13' into gingerbread-plus-aosp

* commit 'a9b02f0bfeba5b3df1d6e74e7a695c5d357f2a13':
  Add phony target dist_libraries
2010-07-13 19:02:25 -07:00
Ying Wang
a9b02f0bfe resolved conflicts for merge of a6bed2f7 to gingerbread
Change-Id: Ic9efcc70af22f15a1bb136f70a30db59dc629e03
2010-07-13 18:59:56 -07:00
The Android Open Source Project
c608c44c1f am 703f4958: merge from open-source master
Merge commit '703f4958c207c575adfa1526725728b96c575649'

* commit '703f4958c207c575adfa1526725728b96c575649':
  update 404'd source.android.com URLs
2010-07-09 14:56:44 -07:00
The Android Open Source Project
703f4958c2 merge from open-source master
Change-Id: I9381e982495bddb4ddba12bdc46f8c4becddd6bf
2010-07-09 14:54:44 -07:00
The Android Open Source Project
8137a0b659 am d7fcea20: merge from open-source master
Merge commit 'd7fcea201db376e285aab74cefae29d2ac2b33df'

* commit 'd7fcea201db376e285aab74cefae29d2ac2b33df':
  Create boottarball just like systemtarball
2010-07-09 14:39:00 -07:00
The Android Open Source Project
d7fcea201d merge from open-source master
Change-Id: I0a6dc054775374db6b312feccebc46e26266b1fe
2010-07-09 14:36:12 -07:00
Ying Wang
56997a98c3 am 1599ddd0: am 0d205521: Merge "Enforce 64-bit build environment" into gingerbread
Merge commit '1599ddd08529465aef8f205bd6fce28f16d2ec37'

* commit '1599ddd08529465aef8f205bd6fce28f16d2ec37':
  Enforce 64-bit build environment
2010-07-09 14:13:10 -07:00
Ying Wang
1599ddd085 am 0d205521: Merge "Enforce 64-bit build environment" into gingerbread
Merge commit '0d205521ae4e8907bcc80774260a68c923970eca' into gingerbread-plus-aosp

* commit '0d205521ae4e8907bcc80774260a68c923970eca':
  Enforce 64-bit build environment
2010-07-09 13:32:00 -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
Ying Wang
d2e830b9b4 Enforce 64-bit build environment
We will only support 64-bit build environment from now on.

Change-Id: Ic58cb3e06e7fc9cf19a65e6c05c26f12ff9886b7
2010-07-08 10:06:50 -07:00
Ying Wang
8d9cbe557d Add phony target dist_libraries
that is only used to put your library into the dist dir when doing a full build.

Change-Id: I11e9dc15237086843ea4a00736c81ffc680ca12e
2010-07-07 16:57:28 -07:00
Ed Heyl
8160d9316a am 7d735133: Add ramdisk.img to the dist dir, again (was removed at some point) - from master - please do no merge b/2590492 and requested again
Merge commit '7d735133cd6f019ce839fa824f4507f19aff2e8f' into gingerbread-plus-aosp

* commit '7d735133cd6f019ce839fa824f4507f19aff2e8f':
  Add ramdisk.img to the dist dir, again (was removed at some point) - from master - please do no merge
2010-07-01 15:02:11 -07:00
The Android Open Source Project
382fd41a9b am 3c37c63a: merge from open-source master
Merge commit '3c37c63a83ff178334b855747ecda4c1f24c38ca'

* commit '3c37c63a83ff178334b855747ecda4c1f24c38ca':
  Fix to "make ddmlib ddmuilib" under Windows/Cygwin.
2010-07-01 11:56:01 -07:00
Ed Heyl
7d735133cd Add ramdisk.img to the dist dir, again (was removed at some point) - from master - please do no merge
b/2590492 and requested again

Change-Id: I1f4efac2a8ca47f1b69761bb9233427e0ca0411d
2010-07-01 10:25:09 -07:00
Ed Heyl
8532aa03be Add ramdisk.img to the dist dir, again (was removed at some point)
b/2590492 and requested again

Change-Id: I5e4c8efddf7a202694c36231c6082089eedefa5d
2010-07-01 10:07:28 -07:00
The Android Open Source Project
3c37c63a83 merge from open-source master
Change-Id: Idf8c8890a251c77b131fed6019428501a41fd788
2010-07-01 08:30:40 -07:00
Ying Wang
34377b9ed8 am 9fd6b635: am ca88861b: am 783f449b: Don\'t copy apns-conf.xml for apps-only build
Merge commit '9fd6b635d4f631968ed7a39394918ea3cd87f459'

* commit '9fd6b635d4f631968ed7a39394918ea3cd87f459':
  Don't copy apns-conf.xml for apps-only build
2010-06-30 16:40:22 -07:00
Ying Wang
ca88861ba6 am 783f449b: Don\'t copy apns-conf.xml for apps-only build
Merge commit '783f449bdc0fe8aa9f2385c22bb0831fa3d5d1c9' into gingerbread

* commit '783f449bdc0fe8aa9f2385c22bb0831fa3d5d1c9':
  Don't copy apns-conf.xml for apps-only build
2010-06-30 16:34:52 -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
Ying Wang
783f449bdc Don't copy apns-conf.xml for apps-only build
http://b/issue?id=2796939
This can fix commands mm and mmm in an unbundled branch.
The cause is that mm & mmm depends on phony target "files", which includes apns-conf.xml.

Change-Id: I72ce1c7c5ddfdcd3bbea5cb9645ca3a48ff8ac12
2010-06-30 15:21:27 -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
Ying Wang
6ae5c1b512 am b2fe30f0: am c955834a: am c048c9b5: default empty tapas to TARGET_BUILD_APPS "all"
Merge commit 'b2fe30f05ee9f4ca27a0039a44e3fb3a64c0fc88'

* commit 'b2fe30f05ee9f4ca27a0039a44e3fb3a64c0fc88':
  default empty tapas to TARGET_BUILD_APPS "all"
2010-06-24 18:04:21 -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
c955834ad0 am c048c9b5: default empty tapas to TARGET_BUILD_APPS "all"
Merge commit 'c048c9b598b36dc7506a954cc0d3d80f308b1b13' into gingerbread

* commit 'c048c9b598b36dc7506a954cc0d3d80f308b1b13':
  default empty tapas to TARGET_BUILD_APPS "all"
2010-06-24 17:59:32 -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
Andreas Huber
5f9168c0d5 am c55bb9ec: am f2bab487: Merge "Remove now unnecessary property overrides to opt into stagefright." into gingerbread
Merge commit 'c55bb9ecc92d34e448adec76bc06abdcd3c35f0e'

* commit 'c55bb9ecc92d34e448adec76bc06abdcd3c35f0e':
  Remove now unnecessary property overrides to opt into stagefright.
2010-06-24 09:10:19 -07:00
Andreas Huber
e3bbae0382 Remove now unnecessary property overrides to opt into stagefright.
Change-Id: I9810030e5576ac5a9cb31fcf0ce3f0baa96f6f40
related-to-bug: 2370115
2010-06-23 16:55:06 -07:00
Jeff Hamilton
ba3897fdf1 am 66d41149: am 4a1c70e5: Switch the required host Java environment to 1.6.
Merge commit '66d41149d94fc7153467f9e1b0af55518ba86565'

* commit '66d41149d94fc7153467f9e1b0af55518ba86565':
  Switch the required host Java environment to 1.6.
2010-06-23 13:02:09 -07:00
Jeff Hamilton
4a1c70e53b 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
2010-06-22 16:45:41 -05:00
Guang Zhu
878c62ae14 resolved conflicts for merge of 10b3f4b8 to master
Change-Id: I169c45161af01596c408cd3f3173d67cb541cb46
2010-06-21 13:00:53 -07:00
Guang Zhu
4b13704721 restore emma changes overwrittern by I9174f843
Change-Id: Ic5199ddfdaa2f8366bda960be84464945726e2f5
2010-06-21 12:34:51 -07:00
Ying Wang
f9cd36a0f7 resolved conflicts for merge of 56791ebe to master
Change-Id: I7463636796f1262fd92af839102dc58d562259f7
2010-06-15 15:43:13 -07:00
Ying Wang
c01cf7b9e6 resolved conflicts for merge of 2b8d2383 to gingerbread
Change-Id: I9174f843f0fde139a7d582f45b027f3face5c981
2010-06-15 15:11:51 -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
Ed Heyl
b55b07fef7 am e46a061d: am d7e7e482: am d83f3396: Revert "Merge "Switch the required host Java environment to 1.6." into kraken"
Merge commit 'e46a061d08f9667783d39a60106003497c2ad41e'

* commit 'e46a061d08f9667783d39a60106003497c2ad41e':
  Revert "Merge "Switch the required host Java environment to 1.6." into kraken"
2010-06-11 15:30:54 -07:00
Ed Heyl
d83f33969a Revert "Merge "Switch the required host Java environment to 1.6." into kraken"
This reverts commit 1f29d2c376, reversing
changes made to f9f513ab33.
2010-06-11 15:22:42 -07:00
Sriram Raman
19b9aa3cd1 am ec1c20a7: am 6ad4e499: am 1f29d2c3: Merge "Switch the required host Java environment to 1.6." into kraken
Merge commit 'ec1c20a7077a0afb476f8ca2b290e7a01c002b1d'

* commit 'ec1c20a7077a0afb476f8ca2b290e7a01c002b1d':
  Switch the required host Java environment to 1.6.
2010-06-11 12:34:09 -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
Jeff Hamilton
76478e8ce6 am f597c7be: am f9f513ab: Merge "Make the Java version check non-fatal to aid in the switch to 1.6 on the build servers." into kraken 2010-06-09 15:44:33 -07:00
Jeff Hamilton
d41c06539c Switch the required host Java environment to 1.6.
Change-Id: Ic289e35a747b6f462816aca159acba6d400829c9
2010-06-09 17:01:04 -05:00
Jeff Hamilton
e4fb7ccd9b Make the Java version check non-fatal to aid in the switch to 1.6 on the build servers.
Change-Id: Ieb0779ef54cdfa921a8dbfb1041536f8969d22e4
2010-06-09 16:56:39 -05:00
Ying Wang
f33c3ef933 am b93e03cb: am 52911309: Cherry-pick unbundled build changes from master
Merge commit 'b93e03cbc9d47a9d9a385c780ed64639e2a23ae5' into kraken

* commit 'b93e03cbc9d47a9d9a385c780ed64639e2a23ae5':
  Cherry-pick unbundled build changes from master
2010-06-02 13:11:32 -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
Ying Wang
00f3a02b0f Improve on unbundled app build
1. build only apps specified in APP-xxx.
2. support building multiple apps in a single make: make APP-Gmail-GmailTests-xxx

Change-Id: I863d3b503a240ae43652e9b18043b60416bcc25a
2010-05-19 17:07:00 -07:00
Ying Wang
ebd5a9e11f Dist unbundled app.
Change-Id: Ib4c01b2623ec1059b66c541cc35eae4d2d811ef3
http://b/issue?id=2667113
2010-05-19 17:07:00 -07:00
Ying Wang
1a031e411e Support for unbundled app build
With this CL, run "make APP-{appname}" to build unbundled app in
the unbundled app src tree.
See http://b/issue?id=2667113

Change-Id: I1d753db795142508bc841ae66b4408220ab687c5
2010-05-19 17:07:00 -07:00
Guang Zhu
18b7556642 Squashed commit of the following (DO NOT MERGE):
commit 7401608f3b9b52b3348e32ec9fefe7583d6c2fa4
Author: Guang Zhu <guangzhu@google.com>
Date:   Fri Apr 23 11:54:37 2010 -0700

    collect emm meta files for emma instrumented build

    when doing 'make dist', with EMMA_INSTRUMENT on the coverage.em files
    generated for each module will be collected into one emma_meta.zip file

    Change-Id: I382c39a97005e6cae5c79ad7eaef1c8857f658af

commit 8376d70938f6507d54b66fe5832a637aa883974e
Author: Guang Zhu <guangzhu@google.com>
Date:   Wed Mar 10 15:48:03 2010 -0800

    enhancement for building app with emma code coverage

    * global filter to avoid applying instrumentation on emma classes
    * remove local variable information at dex step instead of compile time

    Change-Id: If04c27bc717f34816077a98ead9ceb0dbcbb0d2f

Change-Id: I971bd0f291bede2568b21347247d37a7d035c661
2010-05-18 15:26:22 -07:00
Joe Onorato
a64dbd75be am 36ce8736: am 77dc0a58: Add a rule that builds an eclipse project file for an app. 2010-05-17 18:30:45 -07:00
Joe Onorato
77dc0a58e2 Add a rule that builds an eclipse project file for an app.
Type make ECLIPSE-<app1>-<app2>... with the apps as listed in LOCAL_PACKAGE_NAME.

Change-Id: Ieb96dfc9dfc13bdf1b3be53572092fc7bc695869
2010-05-17 18:20:42 -07:00
The Android Open Source Project
07c5e16d88 am da9a8535: am 216d8448: am 95f862bc: merge from open-source master 2010-05-14 14:39:21 -07:00
The Android Open Source Project
216d8448a0 am 95f862bc: merge from open-source master
Merge commit '95f862bcb0418fd931c574157a5c90312ea2fb77' into kraken

* commit '95f862bcb0418fd931c574157a5c90312ea2fb77':
  Fix "make modules" script bug under Mac OS X.
2010-05-14 14:37:17 -07:00
The Android Open Source Project
95f862bcb0 merge from open-source master
Change-Id: I4ea9aa2765cb634382da92ff17f5af9e2f6b4078
2010-05-14 14:35:29 -07:00
The Android Open Source Project
eaf130ec2c am 58248935: am cf28b803: am ae4e1455: merge from open-source master 2010-05-03 16:16:25 -07:00
The Android Open Source Project
cf28b80398 am ae4e1455: merge from open-source master
Merge commit 'ae4e14556bb3a789c4263ebba7ed42b3035e13f6' into kraken

* commit 'ae4e14556bb3a789c4263ebba7ed42b3035e13f6':
  Adapt to new location of libcore
  Make expr more POSIXy
  generic_x86 support
  Remove obsolete machine-setup.html reference.
2010-05-03 16:13:22 -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
Jean-Baptiste Queru
60bc203660 Adapt to new location of libcore
Change-Id: I17a2f432f69bd0cb381e83b6395fb2ae6e4faf9d
2010-04-30 13:10:03 -07:00
Jean-Baptiste Queru
aa000340af Adapt to new location of libcore
Change-Id: Ib32222c3541b2aa66df6d6a5519049653647aae7
2010-04-30 12:08:06 -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
df55739f49 am 345cbd2d: am cd0bd801: merge from open-source master 2010-04-28 16:07:06 -07:00
The Android Open Source Project
345cbd2d25 am cd0bd801: merge from open-source master
Merge commit 'cd0bd8011bb955e8ffab9e77180ce2b23ba7e923' into kraken

* commit 'cd0bd8011bb955e8ffab9e77180ce2b23ba7e923':
  Fix "make layoutlib" under Windows+Cygwin
2010-04-28 15:58:23 -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
Ying Wang
a37a2cb231 Dist only if the goal is to be built
Change-Id: I1b794f36a6dc39ce68cc990b967d2d55118c92ca
http://b/issue?id=2635603
2010-04-28 12:59:51 -07:00
Ying Wang
ee79711322 Add ramdisk to dist. [DO NOT MERGE]
cherry-pick from master.
http://b/issue?id=2590492

Change-Id: I1a8f0313a486665847b27fb58ac9a57881d5e913
2010-04-26 11:27:55 -07:00
Guang Zhu
0198d6ebb4 collect emm meta files for emma instrumented build
when doing 'make dist', with EMMA_INSTRUMENT on the coverage.em files
generated for each module will be collected into one emma_meta.zip file

Change-Id: I382c39a97005e6cae5c79ad7eaef1c8857f658af
2010-04-26 11:26:55 -07:00
Ying Wang
8b9b39e995 Add phony target to build and dist sample code.
See http://b/issue?id=2468418
After this CL, add "samplecode" to your make goals, you will get the sample apks
built and installed at out/target/common/samples/.

Change-Id: Iff83f2ba6b6c2fe6ac1c78ca4a9d4bc6953dac8a
2010-04-23 13:57:07 -07:00
Ying Wang
929cdf3313 Add ramdisk.img to the dist dir.
Change-Id: Ia74c501298010734dd1b8db8df86720d3e8bb7cd
http://b/issue?id=2590492
2010-04-23 13:39:40 -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
Raphael
3d224a0fc9 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)

Change-Id: I9d08d0df598b8a7292532d23c55f48101a95a240
2010-04-23 10:06:41 -07:00
Brad Fitzpatrick
135677a718 For userdebug builds, enable Dalvik lock contention sampling.
Change-Id: I75cca6fc0ac0d0adfc059a8f82b2f6ae584361f3
2010-04-19 07:51:12 -07:00
Raphael Moll
7058f499e9 Fix "make layoutlib" under Windows+Cygwin
Change-Id: I5277afe77f1e3367ecfd0933a9ab14a5a42c2be2
2010-04-13 10:49:29 -07:00
Ying Wang
139e33243b Add symbols.zip and build.prop to sdk dist.
Change-Id: I667f5ef847a6e8e78c6b3df5c2b092bb5d863955
http://b/issue?id=2394164
2010-03-31 17:29:04 -07:00
Ying Wang
6714dbc236 Add comments for ANDROID_BUILD_SHELL
Change-Id: I71f0a1a08b097cd179bbcb684a9114267f9bf0db
2010-03-30 16:42:15 -07:00
Ying Wang
2ce495a0a7 Allow use of alternative to bash as the build shell.
Change-Id: Ib92217f90c98e04a1d16efd4904d9d7ba9dda3cf
http://b/issue?id=2557214
2010-03-30 12:55:13 -07:00
Ying Wang
9a6a1e33b3 Add android-info.txt to the dist dir.
Change-Id: I735655205085b0baf490b0dd011eb59cb6d4c45b
http://b/issue?id=2524072
2010-03-17 17:07:39 -07:00
Xavier Ducrohet
b464b5e82e The builders project is gone. Remove it from main.mk
Change-Id: Ibec7be55667e83d635e1de990772e2730d0e75ff
2010-02-24 13:10:55 -08:00
Fred Quintana
5dc8a65917 remove obsolete property ro.config.sync 2010-02-17 13:35:19 -08:00
Raphael
719a123a58 Allow sdk/builders to be built using Windows SDK.
Change-Id: Ic3c8bc2bace166442bf780b625e5d528fea4df9f
2010-02-16 15:16:00 -08:00
Raphael
5993b09194 am ccd0338c: am e749b5a7: Fix windows make: layoutlib_api moved to sdk.git too.
Merge commit 'ccd0338ce637e62c483a727de04236aa05f989aa'

* commit 'ccd0338ce637e62c483a727de04236aa05f989aa':
  Fix windows make: layoutlib_api moved to sdk.git too.
2010-01-28 13:43:39 -08:00
Raphael
e749b5a71a Fix windows make: layoutlib_api moved to sdk.git too.
Change-Id: Ia030eda4514361b20a5ecb29c997ab625909228c
2010-01-22 18:36:37 -08:00
Raphael Moll
44f6dde6a5 am acbbba88: am d1b68863: Merge "Add etc1tool to Windows SDK." into eclair
Merge commit 'acbbba88fb2a2e43b63cb83675ea368c47621ca8'

* commit 'acbbba88fb2a2e43b63cb83675ea368c47621ca8':
  Add etc1tool to Windows SDK.
2010-01-12 15:43:22 -08:00
Raphael
4e7b0e21c5 Add etc1tool to Windows SDK.
SDK BUG 2368918

This depends on Change I83485145 from development.git.

Change-Id: I1b4f5e39bd08c0cfbb656f2857921fb5ad305812
2010-01-12 11:18:02 -08:00
Jean-Baptiste Queru
75127b769e Remove special-handling of the restricted tag.
Nobody is using it any more, and it'd be too easy to
make a build system change that wouldn't properly handle it.

Change-Id: Ia61232ff944c34c46932c1885b2b0ec1b479566b
2010-01-11 09:40:39 -08:00
Jean-Baptiste Queru
6907cfe7de Remove special-case where CLASS=apps ignored TAGS=user
Also add a warning when there's TAG=user on a CLASS=apps module,
as this is not what people normally intend (this should be handled
in core.mk instead).

This used to be a source of confusion, with people using TAGS=user on
APPS and non-APPS modules, and being surprised to see some of those
included but not others.

Change-Id: I56b5618a556abdc6b841bf7a943d77c20fe9a4c5
2010-01-11 09:40:39 -08:00
Andreas Huber
64b00e3f98 Squashed commit of the following:
commit b03d5f537dee393affddf89663ae6977a5512d98
Author: Andreas Huber <andih@google.com>
Date:   Thu Dec 17 14:00:37 2009 -0800

    Update cleanspec to facilitate incremental building with full stagefright lib.

commit b92560a1989f8b9cb27a8772cec5346d3d90dc84
Author: Andreas Huber <andih@google.com>
Date:   Thu Dec 17 13:31:48 2009 -0800

    Enable building stagefright in all builds, make stagefright the default player.
2009-12-17 14:46:46 -08:00
Raphael
c3d743d262 am 81d88c31: am d920ec83: Fix a Windows-only discrepency in the Windows SDK build.
Merge commit '81d88c31be80493886e6844ebf8af8a03273208c' into eclair-mr2

* commit '81d88c31be80493886e6844ebf8af8a03273208c':
  Fix a Windows-only discrepency in the Windows SDK build.
2009-11-18 17:17:54 -08:00
Raphael
6f5cb991f6 am f15e028f: am a62a4421: Fix the Windows SDK build for the development to sdk split.
Merge commit 'f15e028fe822069e44b0e06fa91f537048538f94' into eclair-mr2

* commit 'f15e028fe822069e44b0e06fa91f537048538f94':
  Fix the Windows SDK build for the development to sdk split.
2009-11-18 17:17:51 -08:00
Raphael
81d88c31be am d920ec83: Fix a Windows-only discrepency in the Windows SDK build.
Merge commit 'd920ec8354940653e6cf53a1540360cca3bcc5f7' into eclair

* commit 'd920ec8354940653e6cf53a1540360cca3bcc5f7':
  Fix a Windows-only discrepency in the Windows SDK build.
2009-11-18 17:12:39 -08:00
Raphael
f15e028fe8 am a62a4421: Fix the Windows SDK build for the development to sdk split.
Merge commit 'a62a442129a28bf3a62139183868a13b91e976ad' into eclair

* commit 'a62a442129a28bf3a62139183868a13b91e976ad':
  Fix the Windows SDK build for the development to sdk split.
2009-11-18 17:11:57 -08:00
Raphael
d920ec8354 Fix a Windows-only discrepency in the Windows SDK build.
For some reason, there's a slight behavior difference between
my Windowss machine and the Windows build servers, that is on
mine the include of framework/base results in duplicate build
rules being defined. My machine used to work like the Windows
build server and the behavior mysteriously changed a while
ago. This change should make it all work the same on all boxes.

Change-Id: I45e02e9eadfc586f86caa6a2690deda9648e600d
2009-11-18 14:16:04 -08:00
Raphael
a62a442129 Fix the Windows SDK build for the development to sdk split.
Change-Id: Iabeee6aa319a3d98d05357f508b190ba65196df7
2009-11-17 22:12:33 -08:00
Dan Egnor
573205f483 Remove external/googleclient (the code moved elsewhere) 2009-11-17 21:28:09 -08:00
Fred Quintana
170e1d59f6 add the new accounts and sync package to the generic target and enable sync for all builds 2009-11-03 16:05:03 -08:00
Raphael
aa569862de Windows SDK: support tools/sdklauncher and tools/layoutopt
Change-Id: Iac7d7a0cdc439b2bb1e334e82fe0f354b14d7001
2009-10-12 16:16:02 -07:00
Joe Onorato
0889661cd8 eng builds only -- make the thing that makes setupwizard optional actually work. 2009-10-07 10:01:13 -07:00
Raphael
28fcfdd7dd Fix broken server Windows SDK build.
I removed these lines because for some reason building under Windows
fails for me when they are present. However the build server breaks
so I'll rolling them back and I'll try to understand that later.
2009-08-19 14:06:33 -07:00
Raphael
f6ff4c5acf Windows: Fix platform build. 2009-08-19 11:32:15 -07:00
Raphael
cac4dccb0a am 31a8ac22: BUG 1993354 : Add zipalign to Windows SDK
Merge commit '31a8ac22585b2a8263892487bd38b64783402e06'

* commit '31a8ac22585b2a8263892487bd38b64783402e06':
  BUG 1993354 : Add zipalign to Windows SDK
2009-08-12 12:04:53 -07:00
Raphael
31a8ac2258 BUG 1993354 : Add zipalign to Windows SDK 2009-08-11 15:36:16 -07:00
Joe Onorato
dc1a728fb8 Rewrite findleaves.sh in python
This cuts the make startup time by about 30 seconds.  Python is faster
than bash in this case, and also we can now supply multiple directories
to prune, and skip the .repo directory, which is, uh, big.

This is from my mac laptop:

$ time build/tools/findleaves.sh --prune="./out" . Android.mk > /dev/null

real    0m29.186s
user    0m0.550s
sys 0m5.897s

$ time build/tools/findleaves.py --prune="./out" . Android.mk > /dev/null

real    0m4.701s
user    0m0.645s
sys 0m1.294s

$ time build/tools/findleaves.py --prune="./out" --prune="./.repo" . Android.mk > /dev/null
real    0m0.176s
user    0m0.094s
sys 0m0.080s
2009-08-06 12:09:21 -07:00
Joe Onorato
1de66889ec Don't check build tools versions (including javac) every time make is run.
This trims off another 1/3 of a second from incremental build times.
VERSION_CHECK_SEQUENCE_NUMBER can be incremented to force a check.
2009-07-30 11:54:27 -07:00
Joe Onorato
ead9646f1f Don't run findleaves.sh if we're doing ONE_SHOT_MAKEFILE.
This cuts the minimum mmm time from 17 seconds to 5 seconds on my mac pro.
2009-07-30 11:20:04 -07:00
Joe Onorato
b7c41aaad0 Add a separate version of the docs build that only does the stubs.
That way we don't have to wait for clearsilver to write the thousands
of html files during every build.

(This is the build change, there is also a frameworks/base change)
2009-07-20 11:57:59 -04:00
Joe Onorato
f2bce89880 am e334d255: Speed up the full build.
Merge commit 'e334d255dc8f85d610f4d0339227a0b985494811'

* commit 'e334d255dc8f85d610f4d0339227a0b985494811':
  Speed up the full build.
2009-07-17 17:13:08 -07:00
Joe Onorato
e334d255dc Speed up the full build.
Now, by default, instead of fully building everything,
we skip dexing the modules that aren't going to be included
in the current build.

This will slow down some of the incremental builds (like tests),
but it improves the regular eng build from 27.5 minutes on my
Mac Pro to 25 minutes.  That's not as much of an improvement
as I had hoped for, but it's still better.

There is also a change in here that puts the java-source-list
file which is used to get around limited command line lengths
in the proper directory.  Before this change, it was an
accident that the directory for that file existed!
2009-07-17 16:48:15 -04:00
San Mehat
8e879ba1c5 Revert "Ensure that /system/etc/vold.conf is created in the "generic" product."
This reverts commit ff2c9deb79.

This breaks SD cards on the device (always installs the emulator vold.conf)
2009-07-07 20:13:41 -07:00
Jean-Baptiste Queru
04edc95a32 Merge branch 'master' of git://android.git.kernel.org/platform/build into merge_korg_master
Conflicts:
	core/apicheck_msg_current.txt
2009-07-06 12:27:36 -07:00
Patrick Scott
87c86573e0 Move the BoardConfig.mk search and inclusion to core/config.mk.
This allows TARGET_ARCH_VARIANT to be set by the vendor before we choose the
architecture in core/combo/select.mk.

Also add a primitive armv7-a.mk for turning on hardware floating point.
2009-06-23 15:28:07 -04:00
Joe Onorato
6178e239e6 am 9d9f3678: Java 1.5 is required. Enforce it.
Merge commit '9d9f367895655411c42123177ae1c32f104b3c01'

* commit '9d9f367895655411c42123177ae1c32f104b3c01':
  Java 1.5 is required.  Enforce it.
2009-06-22 22:04:15 -07:00
Joe Onorato
9d9f367895 Java 1.5 is required. Enforce it. 2009-06-22 18:15:38 -07:00
Patrick Scott
1f04a3b8f4 Fix the is_sdk_build check when installing the apns.
This will install the big list of apns on non-sdk eng builds. This is very
helpful after a wipe data for those of us on Cingular.
2009-06-09 14:53:27 -04:00
Android (Google) Code Review
81d04d57f2 am a0bad432: Merge change 3237 into donut
Merge commit 'a0bad432f38f3b5105d79a1dadc1ccda061934b6'

* commit 'a0bad432f38f3b5105d79a1dadc1ccda061934b6':
  Add archquery to the windows make
2009-06-05 00:29:55 -07:00
Raphael
d8a6ac1000 Add archquery to the windows make 2009-06-04 17:02:21 -07:00
Android (Google) Code Review
4afb4f20fc am 3026e96d: Merge change 2245 into donut
Merge commit '3026e96dcea7893d762d3ad1532c3775dfe01b60'

* commit '3026e96dcea7893d762d3ad1532c3775dfe01b60':
  Define TARGET_CPU_ABI for finding native code in .apks
2009-05-22 16:55:41 -07:00
Dianne Hackborn
ecc70d705a Define TARGET_CPU_ABI for finding native code in .apks 2009-05-22 14:54:07 -07:00
Joe Onorato
a3072e5ae5 am eefd0212: Print the platform version and version codename in the big build header.
Merge commit 'eefd0212f10ec83b21d1792130b4cad02d2ce4d5'

* commit 'eefd0212f10ec83b21d1792130b4cad02d2ce4d5':
  Print the platform version and version codename in the big build header.
2009-05-15 08:11:38 -07:00
Joe Onorato
eefd0212f1 Print the platform version and version codename in the big build header. 2009-05-15 09:10:51 -04:00
Android (Google) Code Review
bf1de8cbc9 am a47b47a: Merge change 530 into donut
Merge commit 'a47b47ad120b6410b2159722680907c53217c09c'

* commit 'a47b47ad120b6410b2159722680907c53217c09c':
  Remove obsolete activitycreator from windows SDK makefile.
2009-04-29 11:02:43 -07:00
The Android Open Source Project
98dce16df0 Merge commit 'korg/donut' 2009-04-24 13:54:55 -07:00
Raphael
9058e7293e Remove obsolete activitycreator from windows SDK makefile. 2009-04-23 18:58:26 -07:00
Raphael Moll
a779a05e7e AI 146498: am: CL 145983 am: CL 145911 ADT #1778786: tool to generate stubbed jar file.
This is only a preliminary CL. More will follow but this is
  a good start, with the following caveats:
  What it does:
  - take an input jar, a list of includes, a list of excludes.
  - generate actual Java source for the filtered classes.
  What it doesn't do yet:
  - some more work on filtering inner elements (methods, etc.)
  - properly generate inner classes.
  - hide synthetic fields.
  - some classes body are missing
  - directly generate a stubbed bytecode/jar rather than source.
  I'll likely want to keep the source generator for debugging
  purposes or if we want to integrate with a build system instead.
  - classpath will be changed in the final CL to refer to the external
  ASM lib rather than the project. I need the source for debugging
  rigth now.
  - will review comments before submitting.
  Original author: raphael
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146498
2009-04-16 10:54:10 -07:00
The Android Open Source Project
e53ceac5e2 Merge commit 'korg/cupcake' 2009-04-14 18:17:59 -07:00
Raphael Moll
a190c523af AI 145983: am: CL 145911 ADT #1778786: tool to generate stubbed jar file.
This is only a preliminary CL. More will follow but this is
  a good start, with the following caveats:
  What it does:
  - take an input jar, a list of includes, a list of excludes.
  - generate actual Java source for the filtered classes.
  What it doesn't do yet:
  - some more work on filtering inner elements (methods, etc.)
  - properly generate inner classes.
  - hide synthetic fields.
  - some classes body are missing
  - directly generate a stubbed bytecode/jar rather than source.
  I'll likely want to keep the source generator for debugging
  purposes or if we want to integrate with a build system instead.
  - classpath will be changed in the final CL to refer to the external
  ASM lib rather than the project. I need the source for debugging
  rigth now.
  - will review comments before submitting.
  Original author: raphael
  Merged from: //branches/cupcake/...

Automated import of CL 145983
2009-04-13 18:21:16 -07:00
Joe Onorato
eb19b3e0d1 AI 146003: am: CL 145850 am: CL 145512 SDK add-on updates
- rename the directory and zip file
  - make it build to the dist directory
  Original author: joeo
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146003
2009-04-13 16:32:16 -07:00
Andy McFadden
743e250b30 AI 145942: Enable type-precise GC on sapphire builds.
Automated import of CL 145942
2009-04-13 14:48:35 -07:00
Raphael Moll
a7bfb4f382 AI 145911: ADT #1778786: tool to generate stubbed jar file.
This is only a preliminary CL. More will follow but this is
  a good start, with the following caveats:
  What it does:
  - take an input jar, a list of includes, a list of excludes.
  - generate actual Java source for the filtered classes.
  What it doesn't do yet:
  - some more work on filtering inner elements (methods, etc.)
  - properly generate inner classes.
  - hide synthetic fields.
  - some classes body are missing
  - directly generate a stubbed bytecode/jar rather than source.
  I'll likely want to keep the source generator for debugging
  purposes or if we want to integrate with a build system instead.
  - classpath will be changed in the final CL to refer to the external
  ASM lib rather than the project. I need the source for debugging
  rigth now.
  - will review comments before submitting.
  BUG=1778786

Automated import of CL 145911
2009-04-13 12:53:33 -07:00
Joe Onorato
03fbe40d53 AI 145850: am: CL 145512 SDK add-on updates
- rename the directory and zip file
  - make it build to the dist directory
  Original author: joeo
  Merged from: //branches/cupcake/...

Automated import of CL 145850
2009-04-13 08:31:16 -07:00
Joe Onorato
15ca0bd5d0 AI 145512: SDK add-on updates
- rename the directory and zip file
  - make it build to the dist directory

Automated import of CL 145512
2009-04-09 14:20:30 -07:00
Xavier Ducrohet
f3e79f9041 AI 144767: am: CL 144765 am: CL 144764 Fix the SDK build to properly package what needs to go in the system image (bug #1761105)
Original author: xav
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 144767
2009-04-06 20:32:24 -07:00
Xavier Ducrohet
6a769427c8 AI 144765: am: CL 144764 Fix the SDK build to properly package what needs to go in the system image (bug #1761105)
Original author: xav
  Merged from: //branches/cupcake/...

Automated import of CL 144765
2009-04-06 20:30:02 -07:00
Xavier Ducrohet
f39ac4218b AI 144764: Fix the SDK build to properly package what needs to go in the system image (bug #1761105)
BUG=1761105

Automated import of CL 144764
2009-04-06 20:29:27 -07:00
David 'Digit' Turner
ff2c9deb79 Ensure that /system/etc/vold.conf is created in the "generic" product.
This is necessary to let the emulator mount SD Card images properly through the "vold" mounting daemon
2009-04-01 15:26:07 +02:00
Raphael Moll
d9b64e1350 AI 143880: am: CL 143879 am: CL 143876 Include hprof-conv in SDK (bug #1640225)
Original author: raphael
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143880
2009-03-31 17:20:53 -07:00
Raphael Moll
a401b054a4 AI 143879: am: CL 143876 Include hprof-conv in SDK (bug #1640225)
Original author: raphael
  Merged from: //branches/cupcake/...

Automated import of CL 143879
2009-03-31 17:19:14 -07:00
Raphael Moll
e340277c06 AI 143876: Include hprof-conv in SDK (bug #1640225)
BUG=1640225

Automated import of CL 143876
2009-03-31 17:16:45 -07:00
The Android Open Source Project
6bce205856 auto import from //branches/cupcake_rel/...@138607 2009-03-13 13:04:19 -07:00
The Android Open Source Project
fdd3a1020c auto import from //branches/cupcake/...@137873 2009-03-11 12:11:54 -07:00
The Android Open Source Project
2f31293ba7 auto import from //branches/cupcake/...@137197 2009-03-09 11:52:11 -07:00
The Android Open Source Project
88b607994a auto import from //depot/cupcake/@135843 2009-03-03 19:28:42 -08:00
The Android Open Source Project
05806d7af6 auto import from //depot/cupcake/@135843 2009-03-03 18:28:14 -08:00
The Android Open Source Project
094268cf8c auto import from //depot/cupcake/@132589 2009-03-03 14:03:52 -08:00
The Android Open Source Project
a9b2249753 auto import from //depot/cupcake/@137055 2009-03-02 22:54:15 -08:00
The Android Open Source Project
4d23ccc023 auto import from //branches/cupcake/...@132569 2009-02-20 07:38:28 -08:00
The Android Open Source Project
41977d7cd2 auto import from //branches/cupcake/...@132276 2009-02-19 10:57:29 -08:00
The Android Open Source Project
475fa12ade auto import from //branches/cupcake/...@130745 2009-02-10 15:43:57 -08:00
The Android Open Source Project
35cfb08c58 auto import from //branches/cupcake/...@127436 2009-01-22 00:13:40 -08:00
The Android Open Source Project
66339ad5ce auto import from //branches/cupcake/...@126645 2009-01-15 16:12:07 -08:00
The Android Open Source Project
4f85cc54b3 auto import from //branches/cupcake/...@125939 2009-01-09 17:50:54 -08:00
The Android Open Source Project
dcc08f073b Code drop from //branches/cupcake/...@124589 2008-12-17 18:03:49 -08:00
The Android Open Source Project
b6c1cf6de7 Initial Contribution 2008-10-21 07:00:00 -07:00