Commit graph

2343 commits

Author SHA1 Message Date
Ying Wang
1a031e411e Support for unbundled app build
With this CL, run "make APP-{appname}" to build unbundled app in
the unbundled app src tree.
See http://b/issue?id=2667113

Change-Id: I1d753db795142508bc841ae66b4408220ab687c5
2010-05-19 17:07:00 -07:00
Guang Zhu
11905ca038 am cac3e580: (-s ours) am 18b75566: Squashed commit of the following (DO NOT MERGE): 2010-05-18 18:46:45 -07:00
Guang Zhu
cac3e5803d am 18b75566: Squashed commit of the following (DO NOT MERGE): 2010-05-18 18:45:46 -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
Dan Morrill
899001748e Changing the footer per legal guidance.
Change-Id: Ia20e3b1a69265e1ffe0b50993be12dcd96afa05f
2010-05-18 08:10:14 -07:00
Ying Wang
df63579f4c am 4873a26f: am 01c35179: Fix typo. 2010-05-17 19:25:13 -07:00
Ying Wang
4873a26ffc am 01c35179: Fix typo. 2010-05-17 19:24:11 -07:00
Ying Wang
01c351793a Fix typo.
Change-Id: I6eb60e7b89bd331deaa46e2c3f746aa2b042e1b4
2010-05-17 19:07:21 -07:00
Joe Onorato
e66a8dd59a am ecfca8a5: am 4f9c2052: fix typo 2010-05-17 18:44:35 -07:00
Joe Onorato
ecfca8a564 am 4f9c2052: fix typo 2010-05-17 18:42:32 -07:00
Joe Onorato
4f9c20529e fix typo
Change-Id: Ic00f82ea7bbe570ef30f52b353ba147664d755d7
2010-05-17 18:40:39 -07:00
Joe Onorato
a64dbd75be am 36ce8736: am 77dc0a58: Add a rule that builds an eclipse project file for an app. 2010-05-17 18:30:45 -07:00
Joe Onorato
36ce873649 am 77dc0a58: Add a rule that builds an eclipse project file for an app. 2010-05-17 18:29:04 -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
7c61e97c85 am 06dae704: am d868cad8: Add -Werror=format-security 2010-05-17 15:28:14 -07:00
Nick Kralevich
06dae704fb am d868cad8: Add -Werror=format-security 2010-05-17 15:25:11 -07:00
Ying Wang
83890b72d5 Merge "Allow java source in LOCAL_GENERATED_SOURCE" 2010-05-17 14:59:40 -07:00
Ying Wang
d15b6972bf Allow java source in LOCAL_GENERATED_SOURCE
Change-Id: I82f426f1523f56a87ad396f2d7928b839f7c3ec9
2010-05-17 14:55:00 -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
cefd298d8a am bc2f9318: am 57b44e52: am bc12cd04: merge from open-source master 2010-05-14 16:13:29 -07:00
The Android Open Source Project
bc2f931860 am 57b44e52: am bc12cd04: merge from open-source master 2010-05-14 15:55:28 -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
07c5e16d88 am da9a8535: am 216d8448: am 95f862bc: merge from open-source master 2010-05-14 14:39:21 -07:00
The Android Open Source Project
da9a8535b0 am 216d8448: am 95f862bc: merge from open-source master 2010-05-14 14:38:37 -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
386f70a2b0 am ce88086c: am 105a934f: am 9514fca5: merge from open-source master 2010-05-14 13:47:12 -07:00
The Android Open Source Project
ce88086cc4 am 105a934f: am 9514fca5: merge from open-source master 2010-05-14 13:45:20 -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
7ec45cb463 am 876ae91c: am 06df2923: libdrm2 is never used. Remove the reference to it. 2010-05-14 09:36:01 -07:00
Nick Kralevich
876ae91cc5 am 06df2923: libdrm2 is never used. Remove the reference to it. 2010-05-14 09:34:22 -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
Jesse Wilson
586dc045dc Merge "Moving junit out of core.jar and into core-junit.jar" 2010-05-12 22:03:29 -07:00
Jesse Wilson
f2f3e4b234 Moving junit out of core.jar and into core-junit.jar
This commit was submitted too early:
   https://android-git.corp.google.com/g/50610
...and then rolled back:
   https://android-git.corp.google.com/g/50622

Change-Id: I5f4e53bd0c892ab64711b99b2e95d2f101626dbc
2010-05-11 20:20:49 -07:00
Kristian Monsen
9c01eb9f23 Added libchromium.so to the prelink map in the temp section.
Change-Id: I9f5c42ba24c5ca17a7d274029f5b845e2ca1950a
2010-05-11 18:16:55 +01:00
Colin Cross
144b028eac Fix dependencies on ext2 user images
Change-Id: I0efca76ef0c38db40c41be573457b788b7b8d451
2010-05-10 13:24:29 -07:00
The Android Open Source Project
2373361ecb am 63cac277: am f48c3ac3: am f7c63421: merge from open-source master 2010-05-10 11:13:56 -07:00
The Android Open Source Project
63cac27739 am f48c3ac3: am f7c63421: merge from open-source master 2010-05-10 11:13:00 -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
0f28a15755 am 68ed2f54: am 758c0f34: am de14ee57: am 3494d9b3: docs: lighten the "new" red. softens the effect and makes it more legible when selected 2010-05-10 10:30:58 -07:00
Scott Main
68ed2f54ba am 758c0f34: am de14ee57: am 3494d9b3: docs: lighten the "new" red. softens the effect and makes it more legible when selected 2010-05-10 10:29:34 -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