Commit Graph

459 Commits

Author SHA1 Message Date
The Android Open Source Project cb8eedc5c4 am 6069db77: merge from open-source master
Merge commit '6069db77bbd93bdf2a4635a8a7d2ccfb90f0fa75'

* commit '6069db77bbd93bdf2a4635a8a7d2ccfb90f0fa75':
  Add full-eng instead of generic-eng in the lunch menu
2010-07-02 07:33:39 -07:00
The Android Open Source Project 6069db77bb merge from open-source master
Change-Id: I8ff445963424ee9520f5de46f6ca8d2c3313c819
2010-07-02 07:31:36 -07:00
Jean-Baptiste Queru 45038e062d Add full-eng instead of generic-eng in the lunch menu
Change-Id: I3f779087021ef3674ee9ceb8cc3b15f83a98b8f4
2010-07-01 09:22:53 -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 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
Andy McFadden d3e1d0e960 am 8969167d: am bd960940: Ignore STAY_OFF_MY_LAWN when setting JAVA_HOME.
Merge commit '8969167db684ebdbfe72dd57aea7f7bdd5de8064'

* commit '8969167db684ebdbfe72dd57aea7f7bdd5de8064':
  Ignore STAY_OFF_MY_LAWN when setting JAVA_HOME.
2010-06-24 13:32:02 -07:00
Andy McFadden bd960940e1 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-24 12:52:51 -07:00
Joe Onorato 74ba0c834f am 1884d99a: am aee4daac: The java version changed, and we made envsetup automatically find the right JAVA_HOME.
Merge commit '1884d99a7ab74dd53d9134d6200bb0aff3867f8c'

* commit '1884d99a7ab74dd53d9134d6200bb0aff3867f8c':
  The java version changed, and we made envsetup automatically find the right JAVA_HOME.
2010-06-23 16:04:38 -07:00
Joe Onorato aee4daacc8 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
2010-06-23 14:03:13 -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
Jing Yu 96c286daf1 am eed926c8: am ada132a8: Switch toolchain from gcc-4.4.0 to gcc-4.4.3
Merge commit 'eed926c889382073c74de43a0d15e37462623cf3'

* commit 'eed926c889382073c74de43a0d15e37462623cf3':
  Switch toolchain from gcc-4.4.0 to gcc-4.4.3
2010-06-16 20:47:01 -07:00
Jing Yu ada132a80b Switch toolchain from gcc-4.4.0 to gcc-4.4.3
gcc-4.4.3 toolchain is based on fsf GCC-4.4.3 with numerous patches.
It reduces 3.65% code size than the prebuilt gcc-4.4.0 toolchain,
and improves 3.4% performance on Android benchmarks.

The toolchain uses gold as default linker. With gold, the toolchain
further reduces 1MB system image.

Change-Id: I55eb4df185f2932e71498fcc28428e4d1b175393
2010-06-16 20:17:19 -07:00
Ying Wang f9cd36a0f7 resolved conflicts for merge of 56791ebe to master
Change-Id: I7463636796f1262fd92af839102dc58d562259f7
2010-06-15 15:43:13 -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
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 a4db49fc57 am a207ba0d: am 02fc6267: am 04be0d86: Set JAVA_HOME to point to java 1.5. 2010-06-08 14:07:47 -07:00
Jeff Hamilton 04be0d869a Set JAVA_HOME to point to java 1.5.
Change-Id: I1304b78b17cd13a2231c59385a94e0430a8198ff
2010-06-08 15:38:47 -05:00
Brian Carlstrom 177285a31e Fix get_abs_build_var to work from below $ANDROID_BUILD_TOP
I tried running gdbclient from a subdirectory of $ANDROID_BUILD_TOP
and found that the absolute paths generated by get_abs_build_var
included my subdirectory's path. This fixed get_abs_build_var to
changing directory in a subshell to $ANDROID_BUILD_TOP before invoking
make.

Change-Id: I12b9d9135ac7c044c21c88ed5705b22b0700c039
2010-04-06 13:22:02 -07:00
Jean-Baptiste Queru 748e638c3d Source vendorsetup.sh from the device tree.
This way, individual open-source device configurations can
publish device-specific configurations without having
to maintain those centrally in envsetup.sh

Bug: 2533998
Change-Id: I1377846d4d3ebe7abcd2f8279a08abe54039cdbb
2010-03-22 10:59:08 -07:00
Ficus Kirkpatrick 8889bdf39c Make cgrep look for *.c, *.cc, *.cpp, *.h exclusively.
It was doing '*.c*' which both included .class files and omitted .h files.

Change-Id: Iedaac4f7ee86df86fdc38341c04ca565f34223b4
2010-03-01 16:51:47 -08:00
Gilles Debunne 8a20f580a8 Make mmm handle symbolic links.
Use the PWD= /bin/pwd trick used in getopt in mmm so that it can deal with a symlinked
root directory.

Change-Id: Ia8b5ef10cbd10ca05f2301db86f64fdf11ff2840
2010-02-17 15:56:45 -08:00
Brian Carlstrom 259e5b7a94 godir search should ignore .repo directory 2010-01-30 11:45:03 -08:00
Brian Carlstrom b9915a6a18 godir should set "T=$(gettop)" 2010-01-29 16:39:32 -08:00
Dan Bornstein d0b274d962 Tweak gettop() -- used in defining ANDROID_BUILD_TOP -- to expand symlinks.
This makes runtest, in particular, happier, since it will now find that
its idea of the cwd actually matches with what's claimed in ANDROID_BUILD_TOP.

Change-Id: I485df382d9d314a73b410030bf2116215b6250f9
2009-11-24 15:48:50 -08:00
Christopher Tate 744ee8025a Add a host shell function to generate system_server stack traces
For debugging non-ANR weird states in the system server, it is incredibly handy
to be able to force a complete thread-stack dump of that process.  Here's a
shell function that does so (creating the /data/anr/traces.txt file with the
usual permissions if it does not yet exist).

Depends on adb having been configured to run as root.

Change-Id: I01d9d733ef08ffefb00cb61968df36ecf62087f0
2009-11-12 15:33:08 -08:00
Brett Chabot 3fb149d2cb Remove 'cd top' step from envsetup runtest shortcut.
Instead, execute runtest as an absolute path. Ths is necessary to support
relative path based arguments in runtest. Bug 2133198
2009-10-21 20:05:26 -07:00
Joe Onorato 2a5d4d81b2 Add cproj function to envsetup.sh that finds an Android.mk and goes to its directory. 2009-07-30 10:24:28 -07:00
Robert Greenwalt 3c794d71b9 Fix LOCAL_PATH in mm builds so that overlays work
LOCAL_PATH is a relative path from TOP when making a full build.
This change makes that true for mm builds too.
2009-07-15 15:07:44 -07:00
Android (Google) Code Review 9945bac303 am bd1ee348: Merge change 6059 into donut
Merge commit 'bd1ee348a1891836cf3b5d0da72e75c0d256fa43'

* commit 'bd1ee348a1891836cf3b5d0da72e75c0d256fa43':
  Also look in vendor/*/build for vendorsetup.sh
2009-07-03 08:58:53 -07:00
Joe Onorato a8c14e8c33 Also look in vendor/*/build for vendorsetup.sh 2009-07-02 08:43:00 -04:00
Jing Yu b845c2fe20 Switch default toolchain to 4.4.0 in master. 2009-06-17 12:06:23 -07:00
Android (Google) Code Review 2990dc7d5e am a3896fb: Merge change 1001 into donut
Merge commit 'a3896fbc15d32881d87e1ae8b7c6e2e7523008c7'

* commit 'a3896fbc15d32881d87e1ae8b7c6e2e7523008c7':
  Change runtest env shortcut to point to runtest.py
2009-05-06 16:43:54 -07:00
Brett Chabot 3ec9f33d42 Change runtest env shortcut to point to runtest.py 2009-05-05 15:32:46 -07:00
Joe Onorato b395e611d4 am 8849aed: Slim down chooseproduct (used by choosecombo).
Merge commit '8849aedde07373948b45a55703e7764de0a7199d'

* commit '8849aedde07373948b45a55703e7764de0a7199d':
  Slim down chooseproduct (used by choosecombo).
2009-04-29 21:20:21 -07:00
Joe Onorato 8849aedde0 Slim down chooseproduct (used by choosecombo).
People keep getting confused by the default products
in this list, which are almost never what they want,
because this list roughly corresponds to the DEVICES
and not the PRODUCTS.

Now that lunch works again, I'm not too worried about
choosecombo except for the couple of cases lunch can't
handle, like the simulator.  Therefore, this change
just removes the list of suggested products, and you
have to know which one you're trying to build (which
seems like a resonable prerequisite).
2009-04-29 17:14:16 -07:00
Joe Onorato 51e61829e7 Make mmm stop if it can't find an Android.mk in a directory you give it. 2009-04-13 15:36:15 -04:00
Jack Veenstra 8f8b99c40a AI 145709: Fixed tracedmdump() by correcting the KERNEL path.
Merged 145592 from master.
  BUG=1630077

Automated import of CL 145709
2009-04-10 10:30:51 -07:00
Jack Veenstra c6c4db56eb Merge branch 'readonly-p4-master' 2009-04-09 18:13:45 -07:00
Jack Veenstra 60116fc2cb AI 145592: Fixed the tracedmdump() bash function to use the correct path for the vmlinux-qemu file.
BUG=1630077

Automated import of CL 145592
2009-04-09 18:12:34 -07:00
The Android Open Source Project 3c9e08a9ff Merge commit 'goog/readonly-p4-master' 2009-03-31 21:34:23 -07:00
Brett Chabot 03e1e28c19 AI 143784: am: CL 143737 Fix kernel build: remove the '.' from runtest.py shortcut
Original author: brettchabot
  Merged from: //branches/cupcake/...

Automated import of CL 143784
2009-03-31 14:53:34 -07:00
Brett Chabot d06a633f4a AI 143809: am: CL 143784 am: CL 143737 Fix kernel build: remove the '.' from runtest.py shortcut
Original author: brettchabot
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143809
2009-03-31 14:41:33 -07:00
Brett Chabot e253d822dd AI 143263: am: CL 143102 Add build environment shortcut to runtest.py.
This change does not affect device code.
  Original author: brettchabot
  Merged from: //branches/cupcake/...

Automated import of CL 143263
2009-03-27 20:17:02 -07:00
Brett Chabot b18e16d359 AI 143392: am: CL 143263 am: CL 143102 Add build environment shortcut to runtest.py.
This change does not affect device code.
  Original author: brettchabot
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143392
2009-03-27 19:50:26 -07:00
The Android Open Source Project d581145459 Merge commit 'goog/cupcake' 2009-03-27 18:48:30 -07:00
Brett Chabot 762748cfea AI 143102: Add build environment shortcut to runtest.py.
This change does not affect device code.
  BUG=1741172

Automated import of CL 143102
2009-03-27 10:25:11 -07:00
Jean-Baptiste Queru ccf4b83b02 Merge commit 'remotes/korg/cupcake' into cupcake_to_master
Conflicts:
	core/prelink-linux-arm.map
2009-03-18 16:58:18 -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
Benno Leslie 5ef878ac38 Updated the sgrep tool so that is will treat Makefiles (.mk)
and shell scripts (.sh) as 'source' files.
2009-02-27 21:04:08 +11: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 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