Commit graph

2617 commits

Author SHA1 Message Date
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
The Android Automerger
15d9123ec1 FRF47B
Change-Id: If37080f70de84e166156cfa08c7d9f280fa20929
2010-05-17 17:38:14 -07:00
The Android Automerger
6f87136788 FRF47
Change-Id: Ic1b582bc9d7d67cffcaca1eefc67cfa3a41a64f6
2010-05-17 15:19:17 -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
The Android Automerger
a10bf3242a FRF44
Change-Id: I9463c0ac1febf8088f655040816903ad8176405d
2010-05-14 12:12:31 -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 Automerger
0c13675feb FRF42
Change-Id: Ief4e6ddd16774091121603cb6b167dfbe79b27f0
2010-05-12 19:53:35 -07:00
The Android Automerger
d00884bac0 FRF41
Change-Id: I7aeb48a7f6a7af6d807a00905ffc3c57028e5880
2010-05-11 16:40:31 -07:00
The Android Automerger
a1bb8cd4e0 FRF40
Change-Id: I318dee92db24bebe11234cea595b864eb7caac34
2010-05-10 18:12:11 -07:00
The Android Automerger
8b674a0471 Merge branch 'froyo' into froyo-release 2010-05-10 18:11:58 -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
The Android Automerger
57904900d9 FRF37
Change-Id: I6e5c40cb315e84fd9d21f64c2a21e071fb4db4b9
2010-05-07 10:58:05 -07:00
The Android Automerger
25d1ecfc02 FRF36
Change-Id: I659c91146118ae9cb8270cd96a45fb2b96041c3c
2010-05-06 17:55:18 -07:00
The Android Automerger
07b4d3f8b0 Merge branch 'froyo' into froyo-release 2010-05-06 17:55:05 -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
Dan Bornstein
6e079d7e3d 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 '03fb96f01eeed12ce5dc6dd8fa2e839ed497758e' into froyo-plus-aosp

* commit '03fb96f01eeed12ce5dc6dd8fa2e839ed497758e':
  Allow for a slightly larger libwebcore, add another library to the list,
2010-05-06 16:12:06 -07:00
Dan Bornstein
03fb96f01e Allow for a slightly larger libwebcore, add another library to the list,
correct/update a couple entries, and add a couple more comments.

Bug: 2651381
Change-Id: I9aaf48c3c2115b111794710bb4e959613bf22add
2010-05-06 12:43:47 -07:00
Scott Main
ae98747d7c add froyo graphic for homepage and fix css bug
Change-Id: Ie040686a6c7982233d72298403a88f794b6b26db
2010-05-06 11:43:08 -07:00
The Android Automerger
cb1affafb7 FRF35
Change-Id: I6251d32cd9dcaefefd1bd7d35e33e6a3a9c92f04
2010-05-05 22:11:46 -07:00
The Android Automerger
86e0e78862 Merge branch 'froyo' into froyo-release 2010-05-05 22:11:33 -07:00
The Android Open Source Project
7c1a018fd2 am f9e275b0: merge from open-source master
Merge commit 'f9e275b0c785aa8ed83606e5b98f37d2050a528e' into kraken

* commit 'f9e275b0c785aa8ed83606e5b98f37d2050a528e':
  Add support for x86 VirtualBox Emulation
2010-05-05 15:20:00 -07:00
The Android Open Source Project
f9e275b0c7 merge from open-source master
Change-Id: Ie06ab3b2424480706c644f1a803a6e3de400f15d
2010-05-05 15:16:56 -07:00
Ying Wang
4e601a46a6 Merge "Hack to skip dexpreopt on Maps.apk and SholesQuickOffice.apk" into froyo-release 2010-05-05 14:50:04 -07:00
Dan Bornstein
ea4b1a8600 am aed937ba: am 3ca0e96a: Merge "Fixed a bunch of stuff in the prelink mappings file:" into froyo
Merge commit 'aed937ba46e4137ad5a5d047a438f48c4c81e46b' into kraken

* commit 'aed937ba46e4137ad5a5d047a438f48c4c81e46b':
  Fixed a bunch of stuff in the prelink mappings file:
2010-05-05 14:39:24 -07:00
Dan Bornstein
aed937ba46 am 3ca0e96a: Merge "Fixed a bunch of stuff in the prelink mappings file:" into froyo
Merge commit '3ca0e96a3a66a6c53536bf7346f616e672e2c57a' into froyo-plus-aosp

* commit '3ca0e96a3a66a6c53536bf7346f616e672e2c57a':
  Fixed a bunch of stuff in the prelink mappings file:
2010-05-05 14:37:24 -07:00
Dan Bornstein
3ca0e96a3a Merge "Fixed a bunch of stuff in the prelink mappings file:" into froyo 2010-05-05 14:36:04 -07:00