Commit graph

187 commits

Author SHA1 Message Date
Jorg Pleumann
1f61dc3e19 am 6178820: AI 148430: Adding a new CTS test runner that is basically
Merge commit '6178820340ccca2656fab0953bbe77da2e3e4bb7' into donut

* commit '6178820340ccca2656fab0953bbe77da2e3e4bb7':
  AI 148430: Adding a new CTS test runner that is basically
2009-05-07 01:36:23 -07:00
Jorg Pleumann
6178820340 AI 148430: Adding a new CTS test runner that is basically
a copy of the old one, but resides in android/cts
  and is built and installed as part of the CTS.
  This makes sure we always have the correct test
  runner on a device, so we should see the various
  improvements also on off-the-shelf Cupcake phones.
  BUG=1537738

Automated import of CL 148430
2009-05-07 01:33:14 -07:00
San Mehat
e36c4a5b0b am 6ffb159: prelink: Add libsysutils to prelink map
Merge commit '6ffb159a8be65e2a63f17cc35f57e79e3e26809b'

* commit '6ffb159a8be65e2a63f17cc35f57e79e3e26809b':
  prelink: Add libsysutils to prelink map
2009-05-06 16:43:54 -07:00
San Mehat
6ffb159a8b prelink: Add libsysutils to prelink map
Signed-off-by: San Mehat <san@google.com>
2009-05-06 11:24:13 -07:00
Dave Bort
8acd848320 Merge commit '9528248' into master
Conflicts:
	core/combo/linux-arm.mk

Signed-off-by: Dave Bort <dbort@android.com>
2009-05-05 17:04:51 -07:00
Dave Bort
952824843b core: Don't debug native modules when TARGET_BUILD_TYPE==debug
Don't make the simulator default to debug mode.

Remove all global "debug" {C,CPP}FLAGS, which are no longer used.
2009-05-04 18:12:32 -07:00
Android (Google) Code Review
e159bea824 Merge change 954
* changes:
  Extend build system to compile generated "C" files.
2009-05-04 15:41:01 -07:00
Jack Palevich
e7b3e2c62e Extend build system to compile generated "C" files.
Until now only generated assembly or C++ files would be compiled. This patch extends the build
system to compile generated C files as well. The new rule is modeled on the existing rules for
compiling generated C++ files and the existing rule for compiling ordinary C files.
2009-05-04 15:03:23 -07:00
James Dong
b41e725eae merged 2d2a9acac2 with conflicts.... 2009-05-04 11:23:14 -07:00
Android (Google) Code Review
6062815e2e Merge change 859 into donut
* changes:
  Change 77 from git master branch: change the prelink-linux-arm.map to include OC 2.0 new shared libs - remove redundant share lib from the map - remove 2way share lib from the map
2009-05-01 14:08:59 -07:00
James Dong
2d2a9acac2 Change 77 from git master branch:
change the prelink-linux-arm.map to include OC 2.0 new shared libs
- remove redundant share lib from the map
- remove 2way share lib from the map
2009-05-01 11:34:17 -07:00
Doug Kwan
6fa3704187 am 8c9bef6: switch compiler to gcc-4.3.1
Merge commit '8c9bef616666ee8c6d5cc9243f3d89c44d15d216'

* commit '8c9bef616666ee8c6d5cc9243f3d89c44d15d216':
  switch compiler to gcc-4.3.1
2009-04-30 18:11:11 -07:00
Joe Onorato
2f5b79ef04 am 7b2845a: Don\'t rebuild the NOTICE files when building with mm, mmm, e
Merge commit '7b2845ab1a47324a6fb25261048510e79656a732'

* commit '7b2845ab1a47324a6fb25261048510e79656a732':
  Don't rebuild the NOTICE files when building with mm, mmm, etc.
2009-04-30 16:52:20 -07:00
Doug Kwan
8c9bef6166 switch compiler to gcc-4.3.1
Switch default ARM compiler to gcc-4.3.1 for Neon support.
2009-04-30 15:04:28 -07:00
Joe Onorato
7b2845ab1a Don't rebuild the NOTICE files when building with mm, mmm, etc. 2009-04-30 13:52:50 -07:00
Phil Dubach
6cdbde9489 am e3a5777: am ccd2def: AI 147847: CTS: Fix core test dependencies in CT
Merge commit 'e3a5777a67b09bd54500c1b78c714972fa4793ef'

* commit 'e3a5777a67b09bd54500c1b78c714972fa4793ef':
  AI 147847: CTS: Fix core test dependencies in CTS makefile
2009-04-29 11:02:43 -07:00
Bill Napier
4fa1f8e3bc am e468abd: am f22b9a0: AI 147775: Also add ApiDemos to make sure it get
Merge commit 'e468abda1c64923908ae711743d3e8c9f1b4a477'

* commit 'e468abda1c64923908ae711743d3e8c9f1b4a477':
  AI 147775: Also add ApiDemos to make sure it gets included in the TestCase repository as
2009-04-29 11:02:43 -07:00
Jorg Pleumann
56d4db7d7a am ecc08d0: am b3e0126: AI 147731: Forgot to submit the build changes fo
Merge commit 'ecc08d02b18f67a84df2f69e0d807761fc8dad15'

* commit 'ecc08d02b18f67a84df2f69e0d807761fc8dad15':
  AI 147731: Forgot to submit the build changes for the
2009-04-29 11:02:43 -07:00
Bill Napier
12ff9f3925 am 41ddfa9: am f23f5b4: AI 147479: Update list of CTS test packages.
Merge commit '41ddfa903fe4e91e51d978d30bbbe6748ed1f100'

* commit '41ddfa903fe4e91e51d978d30bbbe6748ed1f100':
  AI 147479: Update list of CTS test packages.
2009-04-29 11:02:43 -07:00
Android (Google) Code Review
bf1de8cbc9 am a47b47a: Merge change 530 into donut
Merge commit 'a47b47ad120b6410b2159722680907c53217c09c'

* commit 'a47b47ad120b6410b2159722680907c53217c09c':
  Remove obsolete activitycreator from windows SDK makefile.
2009-04-29 11:02:43 -07:00
Phil Dubach
e3a5777a67 am ccd2def: AI 147847: CTS: Fix core test dependencies in CTS makefile
Merge commit 'ccd2def288d02ce5adab10bb28878fff05b70aed' into donut

* commit 'ccd2def288d02ce5adab10bb28878fff05b70aed':
  AI 147847: CTS: Fix core test dependencies in CTS makefile
2009-04-28 21:52:48 -07:00
Bill Napier
e468abda1c am f22b9a0: AI 147775: Also add ApiDemos to make sure it gets included i
Merge commit 'f22b9a0ad531f66eb0b5710abae1feefecc42c2b' into donut

* commit 'f22b9a0ad531f66eb0b5710abae1feefecc42c2b':
  AI 147775: Also add ApiDemos to make sure it gets included in the TestCase repository as
2009-04-28 21:52:48 -07:00
Jorg Pleumann
ecc08d02b1 am b3e0126: AI 147731: Forgot to submit the build changes for the
Merge commit 'b3e0126a7a2d32fbae2638e9419739d2d3907c40' into donut

* commit 'b3e0126a7a2d32fbae2638e9419739d2d3907c40':
  AI 147731: Forgot to submit the build changes for the
2009-04-28 21:52:48 -07:00
Bill Napier
41ddfa903f am f23f5b4: AI 147479: Update list of CTS test packages.
Merge commit 'f23f5b486650a923e58e3e79b8ec23cc725b7b33' into donut

* commit 'f23f5b486650a923e58e3e79b8ec23cc725b7b33':
  AI 147479: Update list of CTS test packages.
2009-04-28 21:52:48 -07:00
Phil Dubach
ccd2def288 AI 147847: CTS: Fix core test dependencies in CTS makefile
The core test descriptions did not list all dependencies. When building cts
  for the first time, the descriptions were generated before the cts
  repository was erased.
  BUG=1813815

Automated import of CL 147847
2009-04-27 12:07:38 -07:00
Bill Napier
f22b9a0ad5 AI 147775: Also add ApiDemos to make sure it gets included in the TestCase repository as
well.
  BUG=1810821

Automated import of CL 147775
2009-04-24 18:26:58 -07:00
Jorg Pleumann
b3e0126a7a AI 147731: Forgot to submit the build changes for the
luni.AllTests removal.

Automated import of CL 147731
2009-04-24 13:40:00 -07:00
Raphael
9058e7293e Remove obsolete activitycreator from windows SDK makefile. 2009-04-23 18:58:26 -07:00
Bill Napier
f23f5b4866 AI 147479: Update list of CTS test packages.
Automated import of CL 147479
2009-04-23 10:14:59 -07:00
Phil Dubach
0a4c2b02d0 AI 147397: CTS: Fix VM test description generator
Automated import of CL 147397
2009-04-22 11:56:14 -07:00
Urs Grob
8e5df6c024 Merge branch 'readonly-p4-master' 2009-04-18 22:45:40 -07:00
Urs Grob
4a27b76491 AI 146827: am: CL 146742 am: CL 146710 Splitting android.core.tests.apk into several smaller
apks. Each libcore module gets one apk and luni gets 4.
  Original author: ursg
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146827
2009-04-18 22:44:31 -07:00
Urs Grob
b3c6b2df48 AI 146742: am: CL 146710 Splitting android.core.tests.apk into several smaller
apks. Each libcore module gets one apk and luni gets 4.
  Original author: ursg
  Merged from: //branches/cupcake/...

Automated import of CL 146742
2009-04-17 11:27:08 -07:00
Urs Grob
709b752e3b AI 146710: Splitting android.core.tests.apk into several smaller
apks. Each libcore module gets one apk and luni gets 4.
  BUG=1789657

Automated import of CL 146710
2009-04-17 02:07:14 -07:00
Raphael Moll
1032d83d51 Merge branch 'readonly-p4-master' 2009-04-16 10:55:25 -07:00
Raphael Moll
a779a05e7e AI 146498: am: CL 145983 am: CL 145911 ADT #1778786: tool to generate stubbed jar file.
This is only a preliminary CL. More will follow but this is
  a good start, with the following caveats:
  What it does:
  - take an input jar, a list of includes, a list of excludes.
  - generate actual Java source for the filtered classes.
  What it doesn't do yet:
  - some more work on filtering inner elements (methods, etc.)
  - properly generate inner classes.
  - hide synthetic fields.
  - some classes body are missing
  - directly generate a stubbed bytecode/jar rather than source.
  I'll likely want to keep the source generator for debugging
  purposes or if we want to integrate with a build system instead.
  - classpath will be changed in the final CL to refer to the external
  ASM lib rather than the project. I need the source for debugging
  rigth now.
  - will review comments before submitting.
  Original author: raphael
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146498
2009-04-16 10:54:10 -07:00
Android (Google) Code Review
817a7ba786 Merge change 77
* changes:
  Squashed commit of the following:
2009-04-14 10:47:35 -07:00
Jianhong Jiang
7953e3000f Squashed commit of the following:
commit 191a8bc426782720b38d2af2151f654dc3241ffe
Author: Jianhong Jiang <jianhong@google.com>
Date:   Mon Apr 13 11:06:07 2009 -0700

    Change tabs into 4 spaces.

commit f47721ac22c353a93ddf56e3bd6ca21c01ad7091
Author: Jianhong Jiang <jianhong@google.com>
Date:   Fri Apr 10 14:14:05 2009 -0700

    OpenCore 2.02 prelink map change.
2009-04-13 18:58:11 -07:00
Raphael Moll
a190c523af AI 145983: am: CL 145911 ADT #1778786: tool to generate stubbed jar file.
This is only a preliminary CL. More will follow but this is
  a good start, with the following caveats:
  What it does:
  - take an input jar, a list of includes, a list of excludes.
  - generate actual Java source for the filtered classes.
  What it doesn't do yet:
  - some more work on filtering inner elements (methods, etc.)
  - properly generate inner classes.
  - hide synthetic fields.
  - some classes body are missing
  - directly generate a stubbed bytecode/jar rather than source.
  I'll likely want to keep the source generator for debugging
  purposes or if we want to integrate with a build system instead.
  - classpath will be changed in the final CL to refer to the external
  ASM lib rather than the project. I need the source for debugging
  rigth now.
  - will review comments before submitting.
  Original author: raphael
  Merged from: //branches/cupcake/...

Automated import of CL 145983
2009-04-13 18:21:16 -07:00
Joe Onorato
50d911553b Merge branch 'readonly-p4-master' 2009-04-13 16:33:27 -07:00
Joe Onorato
eb19b3e0d1 AI 146003: am: CL 145850 am: CL 145512 SDK add-on updates
- rename the directory and zip file
  - make it build to the dist directory
  Original author: joeo
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146003
2009-04-13 16:32:16 -07:00
Andy McFadden
801cfe2a50 Merge branch 'readonly-p4-master' 2009-04-13 14:49:50 -07:00
Andy McFadden
743e250b30 AI 145942: Enable type-precise GC on sapphire builds.
Automated import of CL 145942
2009-04-13 14:48:35 -07:00
Raphael Moll
a7bfb4f382 AI 145911: ADT #1778786: tool to generate stubbed jar file.
This is only a preliminary CL. More will follow but this is
  a good start, with the following caveats:
  What it does:
  - take an input jar, a list of includes, a list of excludes.
  - generate actual Java source for the filtered classes.
  What it doesn't do yet:
  - some more work on filtering inner elements (methods, etc.)
  - properly generate inner classes.
  - hide synthetic fields.
  - some classes body are missing
  - directly generate a stubbed bytecode/jar rather than source.
  I'll likely want to keep the source generator for debugging
  purposes or if we want to integrate with a build system instead.
  - classpath will be changed in the final CL to refer to the external
  ASM lib rather than the project. I need the source for debugging
  rigth now.
  - will review comments before submitting.
  BUG=1778786

Automated import of CL 145911
2009-04-13 12:53:33 -07:00
Joe Onorato
681925681a Fix the warning about NOTICE files overriding previous targets.
Use a different name for prebuilt libraries based on their LOCAL_MODULE --
they were all colliding using the same name, javalib.jar.  These names
are synthetic, since the libraries don't actually exist on the device
as such.
2009-04-13 12:51:43 -04:00
Joe Onorato
03fbe40d53 AI 145850: am: CL 145512 SDK add-on updates
- rename the directory and zip file
  - make it build to the dist directory
  Original author: joeo
  Merged from: //branches/cupcake/...

Automated import of CL 145850
2009-04-13 08:31:16 -07:00
Mike Lockwood
f22bf51669 Merge branch 'readonly-p4-master' 2009-04-10 06:36:47 -07:00
Mike Lockwood
ed8b386128 AI 145705: am: CL 145704 Manually integrate change 145576 to donutburger to fix "lunch"
Original author: lockwood

Automated import of CL 145705
2009-04-10 06:35:35 -07:00
Mike Lockwood
8539929a12 AI 145704: Manually integrate change 145576 to donutburger to fix "lunch"
Automated import of CL 145704
2009-04-10 06:34:59 -07:00
Joe Onorato
44a48f7d77 Merge branch 'readonly-p4-master' 2009-04-09 20:45:06 -07:00
Joe Onorato
4c096ad580 AI 145659: am: CL 145621 am: CL 145373 remove a debugging printf that sometimes breaks the build
because the commandline is too long
  Original author: joeo
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 145659
2009-04-09 20:43:57 -07:00
Joe Onorato
fbac5ec731 Merge branch 'readonly-p4-master' 2009-04-09 20:37:13 -07:00
Joe Onorato
214a42bbb6 AI 145655: am: CL 145618 am: CL 145333 Cloned from CL 144759 by 'g4 patch'.
Original change by joeo@abreu on 2009/04/06 19:54:13.
  Implement SDK add-ons in the build system.
  - Add an option to use the standard javadoc doclet instead
  of droiddoc, since droiddocs non-sdk templates aren't
  ready for prime time.
  - Add the notion of a stubs for a library.  It's only
  implemented for java libraries, but when we do native
  libraries in the NDK or sdk-addons, it will work there too.
  Original author: joeo
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 145655
2009-04-09 20:36:06 -07:00
Joe Onorato
92f8a3a7c3 AI 145621: am: CL 145373 remove a debugging printf that sometimes breaks the build
because the commandline is too long
  Original author: joeo
  Merged from: //branches/cupcake/...

Automated import of CL 145621
2009-04-09 19:39:15 -07:00
Joe Onorato
64d85d0d82 AI 145618: am: CL 145333 Cloned from CL 144759 by 'g4 patch'.
Original change by joeo@abreu on 2009/04/06 19:54:13.
  Implement SDK add-ons in the build system.
  - Add an option to use the standard javadoc doclet instead
  of droiddoc, since droiddocs non-sdk templates aren't
  ready for prime time.
  - Add the notion of a stubs for a library.  It's only
  implemented for java libraries, but when we do native
  libraries in the NDK or sdk-addons, it will work there too.
  Original author: joeo
  Merged from: //branches/cupcake/...

Automated import of CL 145618
2009-04-09 19:31:12 -07:00
Dave Bort
ef09681e42 AI 145576: Probe for the proper sed(1) extended regex switch
Automated import of CL 145576
2009-04-09 17:20:55 -07:00
Joe Onorato
15ca0bd5d0 AI 145512: SDK add-on updates
- rename the directory and zip file
  - make it build to the dist directory

Automated import of CL 145512
2009-04-09 14:20:30 -07:00
Joe Onorato
a9cc3ca8be AI 145373: remove a debugging printf that sometimes breaks the build
because the commandline is too long

Automated import of CL 145373
2009-04-09 12:05:55 -07:00
Joe Onorato
8bbfe659d7 AI 145333: Cloned from CL 144759 by 'g4 patch'.
Original change by joeo@abreu on 2009/04/06 19:54:13.
  Implement SDK add-ons in the build system.
  - Add an option to use the standard javadoc doclet instead
  of droiddoc, since droiddocs non-sdk templates aren't
  ready for prime time.
  - Add the notion of a stubs for a library.  It's only
  implemented for java libraries, but when we do native
  libraries in the NDK or sdk-addons, it will work there too.

Automated import of CL 145333
2009-04-09 10:17:32 -07:00
Jean-Baptiste Queru
e34380bea4 revert prelink map to match OpenCORE 1.0 2009-04-08 14:38:13 -07:00
Ravi K Yenduri
be8708351a Enable OpenCORE on master - part 3 2009-04-08 14:37:50 -07:00
Xavier Ducrohet
8f9b9d52fd Merge branch 'readonly-p4-master' 2009-04-06 20:33:25 -07:00
Xavier Ducrohet
f3e79f9041 AI 144767: am: CL 144765 am: CL 144764 Fix the SDK build to properly package what needs to go in the system image (bug #1761105)
Original author: xav
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 144767
2009-04-06 20:32:24 -07:00
Xavier Ducrohet
6a769427c8 AI 144765: am: CL 144764 Fix the SDK build to properly package what needs to go in the system image (bug #1761105)
Original author: xav
  Merged from: //branches/cupcake/...

Automated import of CL 144765
2009-04-06 20:30:02 -07:00
Xavier Ducrohet
f39ac4218b AI 144764: Fix the SDK build to properly package what needs to go in the system image (bug #1761105)
BUG=1761105

Automated import of CL 144764
2009-04-06 20:29:27 -07:00
Doug Zongker
d9290f2a0f Merge branch 'readonly-p4-master' 2009-04-02 10:21:16 -07:00
Doug Zongker
32a27c8577 AI 144157: Manually integrate 144143 from donut to fix build.
Automated import of CL 144157
2009-04-02 10:20:05 -07:00
Doug Zongker
06f93798f4 Merge branch 'readonly-p4-master' 2009-04-02 10:13:30 -07:00
Doug Zongker
7cb8e199b4 AI 144132: am: CL 144130 Don't build OTA package keys into the recovery binary; read
them from an external file in the recovery image.  Use the
  test-keys for all builds.
  Original author: dougz
  Merged from: //branches/donutburger/...

Automated import of CL 144132
2009-04-02 10:12:24 -07:00
Doug Zongker
934de9b758 AI 144143: Define OTA_PUBLIC_KEYS to be the test keys in the otapackage
target as well.

Automated import of CL 144143
2009-04-02 01:15:57 -07:00
Doug Zongker
17c83cf22c AI 144130: Don't build OTA package keys into the recovery binary; read
them from an external file in the recovery image.  Use the
  test-keys for all builds.

Automated import of CL 144130
2009-04-01 15:48:46 -07:00
The Android Open Source Project
3c9e08a9ff Merge commit 'goog/readonly-p4-master' 2009-03-31 21:34:23 -07:00
Raphael Moll
d9b64e1350 AI 143880: am: CL 143879 am: CL 143876 Include hprof-conv in SDK (bug #1640225)
Original author: raphael
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143880
2009-03-31 17:20:53 -07:00
Raphael Moll
a401b054a4 AI 143879: am: CL 143876 Include hprof-conv in SDK (bug #1640225)
Original author: raphael
  Merged from: //branches/cupcake/...

Automated import of CL 143879
2009-03-31 17:19:14 -07:00
Raphael Moll
e340277c06 AI 143876: Include hprof-conv in SDK (bug #1640225)
BUG=1640225

Automated import of CL 143876
2009-03-31 17:16:45 -07:00
Jean-Baptiste Queru
e3a08f2a1f Fix build: disable OpenCORE by default.
Fixes http://b.android.com/2308

This is not meant to be a permanent fix, but since everyone except
a handful of people need this, it's easier to set it for everyone
and have that handful of people unset is locally than to force
everyone to make a local tweak.
2009-03-31 09:34:55 -07:00
The Android Open Source Project
8ac438f110 Merge branch 'open_source' into google_internal
Conflicts:
	core/build_id.mk
2009-03-29 08:55:26 -07:00
The Android Open Source Project
1379256b55 Merge commit 'korg/cupcake' 2009-03-27 15:30:35 -07:00
Eric Fischer
35354dc754 Automated import from //branches/donutburger/...@142719,142719 2009-03-25 17:01:21 -07:00
Eric Fischer
7bbec3ab97 Automated import from //branches/master/...@142758,142758 2009-03-25 16:12:29 -07:00
Eric Fischer
436aefc2d0 Automated import from //branches/cupcake/...@142639,142639 2009-03-25 15:21:11 -07:00
Fredrik Markström
b7990f700b Modify linux-arm.mk to support the armv4t architecture instead of armv4.
armv4 was only implemented on StrongArm and Arm8 (See http://en.wikipedia.org/wiki/ARM_architecture)
and will be more difficult to support since it does not support the bx instruction.
armv4t on the other hand is used in a wide range of cpu:s.
armv4 is also not supported by bionic or dalvik, but armv4t is.

Thumb-mode is not yet enabled since there are some unresolved abi-issues.
2009-03-25 13:20:37 +01:00
Sriram Raman
4bb2b38d7d Automated import from //branches/master/...@142411,142411 2009-03-24 22:47:20 -07:00
Sriram Raman
7b64124f0b Automated import from //branches/donutburger/...@142410,142410 2009-03-24 22:40:59 -07:00
Dave Bort
867c51aa33 Automated import from //branches/master/...@141763,141763 2009-03-24 20:52:27 -07:00
Dave Bort
d14f6d92d4 Automated import from //branches/donutburger/...@141759,141759 2009-03-24 20:50:42 -07:00
Sriram Raman
09591102d0 Automated import from //branches/cupcake/...@142409,142409 2009-03-24 19:39:09 -07:00
Joe Onorato
bd46b21c31 Automated import from //branches/donutburger/...@140982,140982 2009-03-24 19:07:34 -07:00
Joe Onorato
1e7b6d490b Automated import from //branches/master/...@140984,140984 2009-03-24 19:07:34 -07:00
Sriram Raman
0c56ccb7cc Automated import from //branches/cupcake/...@141670,141670 2009-03-24 18:07:52 -07:00
Sriram Raman
14c8a23990 Automated import from //branches/cupcake/...@141669,141669 2009-03-24 18:07:02 -07:00
The Android Open Source Project
b87fef6336 auto import from //branches/cupcake_rel/...@141571 2009-03-19 23:08:36 -07:00
The Android Open Source Project
1fc1b4b05c auto import //branches/master/...@140412 2009-03-18 22:20:24 -07:00
The Android Open Source Project
a7e72e17df auto import //branches/donutburger/...@140359 2009-03-18 20:53:43 -07:00
The Android Open Source Project
f122bec404 auto import from //branches/cupcake_rel/...@140373 2009-03-18 17:39:42 -07:00
Jean-Baptiste Queru
ccf4b83b02 Merge commit 'remotes/korg/cupcake' into cupcake_to_master
Conflicts:
	core/prelink-linux-arm.map
2009-03-18 16:58:18 -07:00
The Android Open Source Project
6bce205856 auto import from //branches/cupcake_rel/...@138607 2009-03-13 13:04:19 -07:00
The Android Open Source Project
fdd3a1020c auto import from //branches/cupcake/...@137873 2009-03-11 12:11:54 -07:00
Ravi K Yenduri
93f49670cf Allow prebuilt libraries and the associated makefile to be in
different directories.
2009-03-10 15:05:09 -05:00
The Android Open Source Project
2f31293ba7 auto import from //branches/cupcake/...@137197 2009-03-09 11:52:11 -07:00