Commit Graph

700 Commits

Author SHA1 Message Date
Guang Zhu
10b3f4b8fc am 4b137047: restore emma changes overwrittern by I9174f843
Merge commit '4b137047210a1e64df1ebc0807d4eeeac7052c1e' into gingerbread-plus-aosp

* commit '4b137047210a1e64df1ebc0807d4eeeac7052c1e':
  restore emma changes overwrittern by I9174f843
2010-06-21 12:51:44 -07:00
Guang Zhu
4b13704721 restore emma changes overwrittern by I9174f843
Change-Id: Ic5199ddfdaa2f8366bda960be84464945726e2f5
2010-06-21 12:34:51 -07:00
The Android Open Source Project
e1fef62bce merge from froyo-plus-aosp - DO NOT MERGE
Change-Id: I5ddea1d56218732cf5cba16e0c8db18399b7f504
2010-06-21 10:55:21 -07:00
Ying Wang
45113a7faa am 06898660: A nothing-to-do build should do nothing.
Merge commit '068986605b2afcd5e044b62f22ac6ecd5c15b519' into gingerbread

* commit '068986605b2afcd5e044b62f22ac6ecd5c15b519':
  A nothing-to-do build should do nothing.
2010-06-21 08:47:44 -07:00
Jean-Baptiste Queru
979e4765e7 Change branch name to openmaster, to avoid confusion
Change-Id: Ibd0e460fd0f0c5d6fa4c1f858fbc280a0bcf7f1a
2010-06-18 08:11:13 -07:00
Ying Wang
068986605b A nothing-to-do build should do nothing.
Before this CL, ota_from_target_files is always executed even with no new change.

Change-Id: I29d6aef3c60e5b0229551a3bf22f2d31cb41f219
2010-06-17 17:52:18 -07:00
Jean-Baptiste Queru
7ef314546b Revert "Build BUILD_MULTI_PREBUILT for the prebuilt target"
This reverts commit 9bfd697cff,
which was causing all prebuilts to be installed in all builds.

Change-Id: Ia5973b31d23bd74ec187b9e44715dea56c063efe
2010-06-17 09:30:37 -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
David 'Digit' Turner
3e4677856f Remove irritating warnings about 'va_list' mangling when building C++ sources.
Change-Id: I6305e93515e57462e7c57af0cc41a659e4190696
2010-06-16 16:04:55 -07:00
Guang Zhu
a943634afa Merge "improvement for emma filter option" into gingerbread 2010-06-16 15:25:19 -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
2b8d238304 Merge changes I02214abd,I79e6f60e into froyo
* changes:
  Add a tapas command.
  Rename is_unbundled_app_build and UNBUNDLED_APP_BUILD to TARGET_BUILD_APPS.
2010-06-15 13:59:01 -07:00
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
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
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
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
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
Jean-Baptiste Queru
64947314b7 Merge "Build BUILD_MULTI_PREBUILT for the prebuilt target" 2010-06-08 10:06:47 -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
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
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
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
Eric Laurent
c5307b85c5 Fix issue 2667796 [Audio Effect Framework] Effect factory and libraries.
Added prelink map entry for libeffects.so. This library contains the
effect factory needed to load plugin effect libraries.

Also remove obsolete entry for libaudiopolicygeneric.so library.

Change-Id: I65db56eec2c1ff1b50c6da0572492138d3e00607
2010-05-21 06:04:15 -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
Ying Wang
01c351793a Fix typo.
Change-Id: I6eb60e7b89bd331deaa46e2c3f746aa2b042e1b4
2010-05-17 19:07:21 -07:00
Joe Onorato
4f9c20529e fix typo
Change-Id: Ic00f82ea7bbe570ef30f52b353ba147664d755d7
2010-05-17 18:40:39 -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
Nick Kralevich
d868cad828 Add -Werror=format-security
Security hardening: don't allow code to compile which
uses format strings in an inappropriate way.  Make format
string compiler warnings into errors.

Change-Id: I1461dad589a2416420fd84ccf765983e859eea8a
2010-05-17 14:30:01 -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
Jean-Baptiste Queru
f91e9e2729 Merge "Fix "make modules" script bug under Mac OS X." 2010-05-14 14:10:50 -07:00
Nick Kralevich
06df292347 libdrm2 is never used. Remove the reference to it.
Change-Id: Iee14e336377cedb56adb71bc4f40ded137906f1f
2010-05-13 12:14:12 -07:00