Commit Graph

140 Commits

Author SHA1 Message Date
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
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 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 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 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 4b13704721 restore emma changes overwrittern by I9174f843
Change-Id: Ic5199ddfdaa2f8366bda960be84464945726e2f5
2010-06-21 12:34:51 -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 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
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 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
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 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 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 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