Commit Graph

2293 Commits

Author SHA1 Message Date
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
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
Xavier Ducrohet 3a212f0fb6 am 0c5363c8: am 8e5605a7: Add QuickSearchBox to the SDK build.
Merge commit '0c5363c8571eef11eeb21a575da941565c34191e' into kraken

* commit '0c5363c8571eef11eeb21a575da941565c34191e':
  Add QuickSearchBox to the SDK build.
2010-05-25 17:50:43 -07:00
Xavier Ducrohet 0c5363c857 am 8e5605a7: Add QuickSearchBox to the SDK build.
Merge commit '8e5605a774fd2f61c6d5bae0440b20fc0bdd79f7' into froyo-plus-aosp

* commit '8e5605a774fd2f61c6d5bae0440b20fc0bdd79f7':
  Add QuickSearchBox to the SDK build.
2010-05-25 17:49:24 -07:00
Xavier Ducrohet 8e5605a774 Add QuickSearchBox to the SDK build.
Change-Id: Ia0cc7b4cd8245d368685d50cf32cd21875cbdbbf
2010-05-25 17:03:42 -07:00
Andreas Huber 588d529e73 Merge "Make Vorbis decoding through stagefright the default." into kraken 2010-05-25 13:57:29 -07:00
Scott Main 9589164caa am b7ebe01f: am ca671ab7: Revert "Doc change: Update froyo mark for home"
Merge commit 'b7ebe01f6049bbb93e7473cdd86b857cb9e18e5f' into kraken

* commit 'b7ebe01f6049bbb93e7473cdd86b857cb9e18e5f':
  Revert "Doc change: Update froyo mark for home"
2010-05-25 12:33:03 -07:00
Scott Main b7ebe01f60 am ca671ab7: Revert "Doc change: Update froyo mark for home"
Merge commit 'ca671ab7a661625e021f2145e2d01f39d542fb28' into froyo-plus-aosp

* commit 'ca671ab7a661625e021f2145e2d01f39d542fb28':
  Revert "Doc change: Update froyo mark for home"
2010-05-25 12:31:29 -07:00
Andreas Huber 1c180a05c7 Make Vorbis decoding through stagefright the default.
Change-Id: I4273b766024f5363fdd05c3d30d0c71209679950
2010-05-25 12:27:03 -07:00
Scott Main ca671ab7a6 Revert "Doc change: Update froyo mark for home"
This reverts commit 9d1d6441d9.
2010-05-25 12:22:29 -07:00
Eric Laurent ba12575bd2 Merge "Fix issue 2667796 [Audio Effect Framework] Effect factory and libraries." into kraken 2010-05-24 23:23:05 -07:00
Chih-Chung Chang ed43e3d784 Merge "Set no camera default for emulator/generic/sim builds." into kraken 2010-05-23 21:03:38 -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
Dirk Dougherty 90fa80937d am d44754e0: am e9b01eb4: Doc change: add tv assets for carousel.
Merge commit 'd44754e0e5e11c33c0ede3eb7e168a301e59a3cf' into kraken

* commit 'd44754e0e5e11c33c0ede3eb7e168a301e59a3cf':
  Doc change: add tv assets for carousel.
2010-05-20 00:17:09 -07:00
Dirk Dougherty d44754e0e5 am e9b01eb4: Doc change: add tv assets for carousel.
Merge commit 'e9b01eb46d461e7cfecb365acf046e2ad56c05a0' into froyo-plus-aosp

* commit 'e9b01eb46d461e7cfecb365acf046e2ad56c05a0':
  Doc change: add tv assets for carousel.
2010-05-20 00:15:38 -07:00
Dirk Dougherty e9b01eb46d Doc change: add tv assets for carousel.
Change-Id: I357509c83e64ceb898b2069482ff1d0f3b3337cc
2010-05-19 19:42:12 -07:00
Dirk Dougherty 5caaeadb10 am e5cfdbfb: am 9d1d6441: Doc change: Update froyo mark for home
Merge commit 'e5cfdbfb17b3915b86d8a5eacee0bf1391504795' into kraken

* commit 'e5cfdbfb17b3915b86d8a5eacee0bf1391504795':
  Doc change: Update froyo mark for home
2010-05-19 18:59:53 -07:00
Dirk Dougherty e5cfdbfb17 am 9d1d6441: Doc change: Update froyo mark for home
Merge commit '9d1d6441d97eeea80c70c549646d7c177936e148' into froyo-plus-aosp

* commit '9d1d6441d97eeea80c70c549646d7c177936e148':
  Doc change: Update froyo mark for home
2010-05-19 18:58:05 -07:00
Dirk Dougherty 9d1d6441d9 Doc change: Update froyo mark for home
Change-Id: Idacecd87faca95cd258436ab842c03102e5fc6c6
2010-05-19 18:25:33 -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 57b44e5287 am bc12cd04: merge from open-source master
Merge commit 'bc12cd04b878a9c3520abd21600c2078c930adc3' into kraken

* commit 'bc12cd04b878a9c3520abd21600c2078c930adc3':
  Use a different kernel boot line for the disk installer.
  Use a property to enable the eth0 LAN port on the emulator
2010-05-14 15:54:09 -07:00
The Android Open Source Project bc12cd04b8 merge from open-source master
Change-Id: I0dd123dde8f0da42a99313cffed6a48d30e38381
2010-05-14 15:52:50 -07:00
Jean-Baptiste Queru 4dccdd6401 Merge "Use a different kernel boot line for the disk installer." 2010-05-14 15:47:56 -07:00
Jean-Baptiste Queru f81d75ed47 Merge "Use a property to enable the eth0 LAN port on the emulator" 2010-05-14 15:47:39 -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
The Android Open Source Project 105a934f3b am 9514fca5: merge from open-source master
Merge commit '9514fca5c78c85b6f5e2d2497b05bbea2613daa8' into kraken

* commit '9514fca5c78c85b6f5e2d2497b05bbea2613daa8':
  Support absolute path, in OUT_DIR
  Updated to better distinguish between options and operands
2010-05-14 13:43:29 -07:00
The Android Open Source Project 9514fca5c7 merge from open-source master
Change-Id: Ia4cb27645bfd757fb75273ff5a6cbf3af57b3a03
2010-05-14 13:38:55 -07:00
Jean-Baptiste Queru 5eac957bdd Merge "Updated to better distinguish between options and operands" 2010-05-14 12:21:31 -07:00
Jean-Baptiste Queru be6b55ccc2 Merge "Support absolute path, in OUT_DIR" 2010-05-14 12:17:43 -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
The Android Open Source Project f48c3ac39d am f7c63421: merge from open-source master
Merge commit 'f7c634216e673407f5a7a879bcf2ddb2454e4670' into kraken

* commit 'f7c634216e673407f5a7a879bcf2ddb2454e4670':
  Replace arm with proper variable for CPU/ABI
2010-05-10 11:11:09 -07:00
The Android Open Source Project f7c634216e merge from open-source master
Change-Id: Id99b6cbc613c6c7b9d1ef79274b1c28b808a32d4
2010-05-10 11:05:12 -07:00
Scott Main 758c0f3475 am de14ee57: am 3494d9b3: docs: lighten the "new" red. softens the effect and makes it more legible when selected
Merge commit 'de14ee570176dbae4b0c6f098088d3872669175d' into kraken

* commit 'de14ee570176dbae4b0c6f098088d3872669175d':
  docs: lighten the "new" red. softens the effect and makes it more legible when selected
2010-05-10 10:28:29 -07:00
Scott Main de14ee5701 am 3494d9b3: docs: lighten the "new" red. softens the effect and makes it more legible when selected
Merge commit '3494d9b3deeb9967be247bf31cdaa3fd30fb4207' into froyo-plus-aosp

* commit '3494d9b3deeb9967be247bf31cdaa3fd30fb4207':
  docs: lighten the "new" red. softens the effect and makes it more legible when selected
2010-05-10 10:26:20 -07:00
Scott Main 3494d9b3de docs: lighten the "new" red. softens the effect and makes it more legible when selected
Change-Id: I0f1f70c281cc0a6f3621c898b04d3845924f6e35
2010-05-10 10:01:13 -07:00
Scott Main dbd7b38eac am 9096ef38: am 3044d243: Merge "add froyo graphic for homepage and fix css bug" into froyo
Merge commit '9096ef382a5c17f4a6618dd19ac203840d807e0a' into kraken

* commit '9096ef382a5c17f4a6618dd19ac203840d807e0a':
  add froyo graphic for homepage and fix css bug
2010-05-10 09:49:59 -07:00
Scott Main 9096ef382a am 3044d243: Merge "add froyo graphic for homepage and fix css bug" into froyo
Merge commit '3044d243c99f46030521fce650add82db640046a' into froyo-plus-aosp

* commit '3044d243c99f46030521fce650add82db640046a':
  add froyo graphic for homepage and fix css bug
2010-05-10 09:43:15 -07:00
Chih-Chung Chang b9e030e52d Set no camera default for emulator/generic/sim builds.
Change-Id: I3c75d093bb48a9d10952d587c3e48bbcc227f139
2010-05-10 15:00:39 +08:00
Jean-Baptiste Queru 7bb4f10a96 Merge "Replace arm with proper variable for CPU/ABI" 2010-05-07 12:53:45 -07:00
Bruce Beare 9d4c5b1c20 Use a different kernel boot line for the disk installer.
Change-Id: I6b20386a24e1141bfe2a252b635243c235d46865
2010-05-07 11:51:30 -07:00
Scott Main 3044d243c9 Merge "add froyo graphic for homepage and fix css bug" into froyo 2010-05-07 11:32:12 -07:00
Dan Bornstein 8a5d30e73a am 6e079d7e: am 03fb96f0: Allow for a slightly larger libwebcore, add another library to the list, correct/update a couple entries, and add a couple more comments.
Merge commit '6e079d7e3d30cd8985fc5d1e34c871cdf2ec5068' into kraken

* commit '6e079d7e3d30cd8985fc5d1e34c871cdf2ec5068':
  Allow for a slightly larger libwebcore, add another library to the list,
2010-05-06 16:31:01 -07:00