Commit Graph

164 Commits

Author SHA1 Message Date
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
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 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
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 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
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
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 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 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
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 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 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 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 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 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 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 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 703f4958c2 merge from open-source master
Change-Id: I9381e982495bddb4ddba12bdc46f8c4becddd6bf
2010-07-09 14:54:44 -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 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
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
The Android Open Source Project 3c37c63a83 merge from open-source master
Change-Id: Idf8c8890a251c77b131fed6019428501a41fd788
2010-07-01 08:30:40 -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