Commit Graph

2639 Commits

Author SHA1 Message Date
Guang Zhu 9cd3d8c654 improvement for emma filter option
the original implementation directly embeds the filter variable into command
line; this implies that filter variable cannot contain any whitespaces,
otherwise it'll be misintepreted as a new command line argument to emma. the
side effect is that user will be forced to cram all filter related java
class/package names into one line, which could be very long. with this
change, user can use line continuation ("\") or appending ("+=") to break
up long filter specs.

Change-Id: I2c130033cdb5120251d6f84c3dd906d140d52991
2010-06-15 13:37:30 -07:00
The Android Automerger f245bf1c6e FRF75
Change-Id: Icb295f833bad1dd3fb6299e6dc1c68b6706830d8
2010-06-14 14:00:49 -07:00
Eric Laurent 71affe70fd am 484d4d54: Merge "Added prelinked library for audio effects JNI." into kraken
Merge commit '484d4d5470336b662a5e65a1f10653c4c433cf84' into gingerbread

* commit '484d4d5470336b662a5e65a1f10653c4c433cf84':
  Added prelinked library for audio effects JNI.
2010-06-14 09:37:15 -07:00
Eric Laurent 484d4d5470 Merge "Added prelinked library for audio effects JNI." into kraken 2010-06-14 09:35:24 -07:00
Ed Heyl d7e7e48252 am d83f3396: Revert "Merge "Switch the required host Java environment to 1.6." into kraken"
Merge commit 'd83f33969aa2734000338e01b84957996ef1bb34' into gingerbread

* commit 'd83f33969aa2734000338e01b84957996ef1bb34':
  Revert "Merge "Switch the required host Java environment to 1.6." into kraken"
2010-06-11 15:27:29 -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 6ad4e499a6 am 1f29d2c3: Merge "Switch the required host Java environment to 1.6." into kraken
Merge commit '1f29d2c376295cb7ba909ae2beb4904099546e89' into gingerbread

* commit '1f29d2c376295cb7ba909ae2beb4904099546e89':
  Switch the required host Java environment to 1.6.
2010-06-11 12:28:12 -07:00
Sriram Raman 1f29d2c376 Merge "Switch the required host Java environment to 1.6." into kraken 2010-06-11 12:24:53 -07:00
The Android Automerger 700d5715e0 FRF72
Change-Id: Idc0551b59e3339ab1162bfa0f2f813cd7cf168f1
2010-06-11 11:47:22 -07:00
The Android Automerger 41cdb0732d Merge branch 'froyo' into froyo-release 2010-06-11 11:47:08 -07:00
Ying Wang 74a9fd0873 am a07d37b7: Cherry-pick bug fixes from master.
Merge commit 'a07d37b79300e76da5f21f532578fcd686a74b16' into gingerbread

* commit 'a07d37b79300e76da5f21f532578fcd686a74b16':
  Cherry-pick bug fixes from master.
2010-06-11 09:04:43 -07:00
Ed Heyl 1d2c25b780 kraken --> gingerbread
Change-Id: I7710134ec026b9c494fe2912809607c162b5ac51
2010-06-11 02:06:03 -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
The Android Automerger 61101d2956 FRF71
Change-Id: I54eda0b63a3ec32b48bbab80c29d3ead8462a3a0
2010-06-10 16:19:36 -07:00
The Android Automerger 7b91fac3c7 Merge branch 'froyo' into froyo-release 2010-06-10 16:19:15 -07:00
Jeff Hamilton f9f513ab33 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:40:36 -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 a07d37b793 Cherry-pick bug fixes from master.
1. Set correct aidl_preprocess_import for LOCAL_SDK_VERSION current.
2. Set correct PRIVATE_BOOTCLASSPATH for non-empty LOCAL_SDK_VERSION.

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

* commit '7a7942899eedde3b946768a155fac3d70af5c9c3':
  Unbundle the build system.
2010-06-09 11:33:32 -07:00
Ying Wang 7a7942899e Merge "Unbundle the build system." into froyo 2010-06-09 11:31:29 -07:00
Ying Wang 0f6f4ca54e Unbundle the build system.
Change-Id: I88912d876c3972212e8871b3e5b3b8b6d2da34d0
2010-06-09 10:26:26 -07:00
Eric Laurent 452c31bc2d Added prelinked library for audio effects JNI.
Change-Id: Ic3d26cedbff599c3ee6fed080b64fce5375ea940
2010-06-09 06:51:12 -07:00
The Android Automerger 066933bbae FRF69C
Change-Id: Ied558c99dc92e0fdbf888e507cd8c35ac210b51e
2010-06-08 17:57:58 -07:00
The Android Automerger a0737f734f FRF69B
Change-Id: Ia90d822a9a271e729d3525c8aed6518746a118bf
2010-06-08 17:10:25 -07:00
The Android Automerger 469ffc607e Merge branch 'froyo' into froyo-release 2010-06-08 17:10:05 -07:00
The Android Automerger 626d7ae7d4 FRF69
Change-Id: Id46f5d68895e92ebb51047a608c7f779aeab7f46
2010-06-08 14:09:14 -07:00
Jeff Hamilton 02fc62673e am 04be0d86: Set JAVA_HOME to point to java 1.5.
Merge commit '04be0d869acce82293b6c668f52bddf14c106908' into kraken

* commit '04be0d869acce82293b6c668f52bddf14c106908':
  Set JAVA_HOME to point to java 1.5.
2010-06-08 14:04:28 -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
The Android Automerger 4117a8bf8a FRF68
Change-Id: Iafa754a31276d3658c45a424d86b9a73d6618fe1
2010-06-07 22:05:04 -07:00
The Android Open Source Project c2f5c0964b am 4873d8f5: (-s ours) merge from open-source master
Merge commit '4873d8f5ca9fecc9c826ad383befbefb3407296b' into kraken

* commit '4873d8f5ca9fecc9c826ad383befbefb3407296b':
  Build host tools as 32bit on all Darwin machines.
2010-06-04 09:53:20 -07:00
The Android Open Source Project 4873d8f5ca merge from open-source master
Change-Id: Id3161ac44e0eaba0184b3d2d4af43e4e40d26e90
2010-06-04 07:56:24 -07:00
The Android Automerger 4844bb5231 FRF64
Change-Id: I791a6e152fa97089042deeb0260ba70c8bf0eabc
2010-06-03 16:21:19 -07:00
The Android Automerger 819cc02d98 Merge branch 'froyo' into froyo-release 2010-06-03 16:21:06 -07:00
Jeff Hamilton 8d09b69e2d Build host tools as 32bit on all Darwin machines.
Change-Id: I121b388056e68b787518c66a01c172bc4ffaef9b
2010-06-03 17:59:11 -05:00
Jeff Hamilton ebc2869b8d Build host tools as 32bit on all Darwin machines.
Change-Id: I121b388056e68b787518c66a01c172bc4ffaef9b
2010-06-03 12:29:19 -05:00
Joe Onorato 13a90e3a20 Add SystemUI.apk to the generic build.
Change-Id: I03d92d93fbcb51808a096fb7d48c1b693efa777d
2010-06-02 14:48:35 -07:00
Ying Wang eee0178732 am e8ffa149: am ba16a89d: Override LOCAL_CERTIFICATE in inherit-package.
Merge commit 'e8ffa1490023eff03335b550c582eaadd3a4561b' into kraken

* commit 'e8ffa1490023eff03335b550c582eaadd3a4561b':
  Override LOCAL_CERTIFICATE in inherit-package.
2010-06-02 14:38:43 -07:00
Ying Wang e8ffa14900 am ba16a89d: Override LOCAL_CERTIFICATE in inherit-package.
Merge commit 'ba16a89dbd61003a3b907d0f5e8fc48fba2afcab' into froyo-plus-aosp

* commit 'ba16a89dbd61003a3b907d0f5e8fc48fba2afcab':
  Override LOCAL_CERTIFICATE in inherit-package.
2010-06-02 14:37:28 -07:00
Andy McFadden f8e9fb3b2a Merge "Atomic/SMP update." into kraken 2010-06-02 13:46:11 -07:00
Ying Wang ba16a89dbd Override LOCAL_CERTIFICATE in inherit-package.
it's to fix typo.

Change-Id: I9a791faa4b7b5967b5d23bfcb4caeebaef94e723
2010-06-02 13:24:36 -07:00
Ying Wang 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
Andy McFadden 5f2b36f854 Atomic/SMP update.
Added "TARGET_CPU_SMP := true" to simulator configuration, since it's
likely the simulator will be running on SMP hardware.

Change-Id: I7527895abe70ffaece5c52fd3ffcfe4b0d698fd2
2010-06-01 08:37:16 -07:00
The Android Automerger 6279ceb8e6 FRF58
Change-Id: Id34e0594991501e259f6e3487e5f965bf397143e
2010-05-28 15:50:07 -07:00
The Android Automerger 7f9802b0c1 FRF57
Change-Id: I4ff4cac94816e9a5947fbe4956655665ef3669b3
2010-05-27 13:21:39 -07:00
Joe Onorato 8a06bac1db Make make ECLIPSE-lunch build a .classpath for all the java stuff that will be included in the
build.

Change-Id: I5a6066fa2afc9cb7bea794770bbb589615a1f9eb
2010-05-26 17:58:21 -04:00
Ying Wang 5291130983 Cherry-pick unbundled build changes from master
Change-Id: I82cab32f00b7b729d9b01c8e1532c8bf0ad2fb92
2010-05-26 13:39:31 -07:00
The Android Automerger b0de05ba3f FRF55
Change-Id: I1427e9b235a7a9116da2fa3b8b88317511409e4c
2010-05-25 21:23:40 -07:00