OSDN Git Service

android-x86/build.git
14 years agoMerge branch 'gingerbread' into gingerbread-release
The Android Automerger [Fri, 30 Jul 2010 15:09:26 +0000 (08:09 -0700)]
Merge branch 'gingerbread' into gingerbread-release

14 years agoam 55edb20e: Merge "Dist apkcerts.txt for unbundled builds" into froyo
Ying Wang [Thu, 29 Jul 2010 17:27:45 +0000 (10:27 -0700)]
am 55edb20e: Merge "Dist apkcerts.txt for unbundled builds" into froyo

Merge commit '55edb20e246e88afd841f63725c647132d9aca17' into gingerbread

* commit '55edb20e246e88afd841f63725c647132d9aca17':
  Dist apkcerts.txt for unbundled builds

14 years agoMerge "Dist apkcerts.txt for unbundled builds" into froyo
Ying Wang [Thu, 29 Jul 2010 17:21:15 +0000 (10:21 -0700)]
Merge "Dist apkcerts.txt for unbundled builds" into froyo

14 years agoGRG29
The Android Automerger [Thu, 29 Jul 2010 15:20:46 +0000 (08:20 -0700)]
GRG29

Change-Id: Iefa8312b3fc13af4f39769ae34a75d37bbfaa6b7

14 years agoMerge branch 'gingerbread' into gingerbread-release
The Android Automerger [Thu, 29 Jul 2010 15:19:54 +0000 (08:19 -0700)]
Merge branch 'gingerbread' into gingerbread-release

14 years agoam 3a0576a4: merge from open-source froyo
The Android Open Source Project [Wed, 28 Jul 2010 18:35:24 +0000 (11:35 -0700)]
am 3a0576a4: merge from open-source froyo

Merge commit '3a0576a41881ceb11c3b11642666abc2f3d5a271' into gingerbread

* commit '3a0576a41881ceb11c3b11642666abc2f3d5a271':

14 years agomerge from open-source froyo
The Android Open Source Project [Wed, 28 Jul 2010 18:24:38 +0000 (11:24 -0700)]
merge from open-source froyo

Change-Id: I947332f4e978326309fe14d01875ebfe94405c9f

14 years agoreconcile forked froyos
The Android Open Source Project [Wed, 28 Jul 2010 17:40:27 +0000 (10:40 -0700)]
reconcile forked froyos

Change-Id: Ie0ab94638cc4489d9644e17d26f0603578a011e7

14 years agoGRG28
The Android Automerger [Wed, 28 Jul 2010 15:26:56 +0000 (08:26 -0700)]
GRG28

Change-Id: Ife1a68ba1edc1d96250a304c548a86ed498fb4e3

14 years agoGRG27
The Android Automerger [Tue, 27 Jul 2010 15:21:02 +0000 (08:21 -0700)]
GRG27

Change-Id: I94196705935d46ec9a6d95f13c3ffd0652e66dde

14 years agoMerge branch 'gingerbread' into gingerbread-release
The Android Automerger [Tue, 27 Jul 2010 15:19:51 +0000 (08:19 -0700)]
Merge branch 'gingerbread' into gingerbread-release

14 years agoam af44485f: merge from open-source froyo
The Android Open Source Project [Mon, 26 Jul 2010 19:06:35 +0000 (12:06 -0700)]
am af44485f: merge from open-source froyo

Merge commit 'af44485fe83bb36a9d55fb54a8f5362854dd7b10' into gingerbread

* commit 'af44485fe83bb36a9d55fb54a8f5362854dd7b10':
  Include Test Case List from CTS Project

14 years agomerge from open-source froyo
The Android Open Source Project [Mon, 26 Jul 2010 19:02:01 +0000 (12:02 -0700)]
merge from open-source froyo

Change-Id: I6bac03b1f646ea171ee20f0e90d37f337d7987fa

14 years agoGRG26
The Android Automerger [Mon, 26 Jul 2010 15:25:59 +0000 (08:25 -0700)]
GRG26

Change-Id: I1e76fab59ad57e55992b25361030525e09a52197

14 years agoMerge branch 'gingerbread' into gingerbread-release
The Android Automerger [Mon, 26 Jul 2010 15:22:48 +0000 (08:22 -0700)]
Merge branch 'gingerbread' into gingerbread-release

14 years agoDist apkcerts.txt for unbundled builds
Ying Wang [Fri, 23 Jul 2010 23:42:13 +0000 (16:42 -0700)]
Dist apkcerts.txt for unbundled builds

Change-Id: Ic381d846f020dc43f48f43581c0db5721f2e36f7

14 years agoresolved conflicts for merge of 121a7873 to gingerbread
Evan Charlton [Fri, 23 Jul 2010 19:21:48 +0000 (12:21 -0700)]
resolved conflicts for merge of 121a7873 to gingerbread

Change-Id: I7b5cecd4236f263c31d4af73d929ff6b5729089e

14 years agoPackages can specify where to find AndroidManifest.xml
Evan Charlton [Fri, 23 Jul 2010 18:03:29 +0000 (11:03 -0700)]
Packages can specify where to find AndroidManifest.xml

By overriding LOCAL_MANIFEST_FILE, a package can now specify which
AndroidManifest.xml file to use. This also allows for AndroidManifest.xml to
be in a non-standard location, though that's not recommended.

Change-Id: Ib6d1baeef7601e5a93d4ce64d18883d45373fc12

14 years agoGRG23
The Android Automerger [Fri, 23 Jul 2010 15:25:15 +0000 (08:25 -0700)]
GRG23

Change-Id: I3d75edf4263e3965ca8315ab57a3a1494f00bd44

14 years agoMerge branch 'gingerbread' into gingerbread-release
The Android Automerger [Fri, 23 Jul 2010 15:24:32 +0000 (08:24 -0700)]
Merge branch 'gingerbread' into gingerbread-release

14 years agoam bce4b75f: Add JNI_H_INCLUDE as default header search path
Ying Wang [Fri, 23 Jul 2010 00:49:13 +0000 (17:49 -0700)]
am bce4b75f: Add JNI_H_INCLUDE as default header search path

Merge commit 'bce4b75fa7801fcb88c6a9ade9465806fe18d441' into gingerbread

* commit 'bce4b75fa7801fcb88c6a9ade9465806fe18d441':
  Add JNI_H_INCLUDE as default header search path

14 years agoAdd JNI_H_INCLUDE as default header search path
Ying Wang [Thu, 22 Jul 2010 22:51:56 +0000 (15:51 -0700)]
Add JNI_H_INCLUDE as default header search path

So that module Android.mk does not need to include it manually.
Also with this change, CL like https://android-git.corp.google.com/g/57887 is not needed.

Change-Id: I68fa73a00c76eb37a8142f35d7eeef79cf53c09b

14 years agoInclude Test Case List from CTS Project
Brian Muramatsu [Thu, 22 Jul 2010 21:46:53 +0000 (14:46 -0700)]
Include Test Case List from CTS Project

Bug 2732160

Have the cts.mk include the test case list from CTS rather
than defining it in cts.mk. This permits CTS developers to
add new packages and applications without having to submit
multiple project changes to both the CTS and build projects
everytime.

Change-Id: I63d90ac4f5d9fc9a9aa0ff79a8bf9dfb1a79c822

14 years agoam d5c217ac: Merge "add phony target "all_modules" and use it as make goal for "mm...
Ying Wang [Thu, 22 Jul 2010 17:58:14 +0000 (10:58 -0700)]
am d5c217ac: Merge "add phony target "all_modules" and use it as make goal for "mm"/"mmm"" into froyo

Merge commit 'd5c217aca18726f0ed9f2ea034f750620d4bdf7d' into gingerbread

* commit 'd5c217aca18726f0ed9f2ea034f750620d4bdf7d':
  add phony target "all_modules" and use it as make goal for "mm"/"mmm"

14 years agoam 75b28573: Fix sim build for unbundling native code
Ying Wang [Thu, 22 Jul 2010 17:58:12 +0000 (10:58 -0700)]
am 75b28573: Fix sim build for unbundling native code

Merge commit '75b28573fe739a10f0f91fab1ef916ddd1c0b91c' into gingerbread

* commit '75b28573fe739a10f0f91fab1ef916ddd1c0b91c':
  Fix sim build for unbundling native code

14 years agoMerge "add phony target "all_modules" and use it as make goal for "mm"/"mmm"" into...
Ying Wang [Thu, 22 Jul 2010 17:51:03 +0000 (10:51 -0700)]
Merge "add phony target "all_modules" and use it as make goal for "mm"/"mmm"" into froyo

14 years agoGRG22
The Android Automerger [Thu, 22 Jul 2010 15:28:53 +0000 (08:28 -0700)]
GRG22

Change-Id: Ia8fb71ad123f8e86eeeedde7551088f692942afd

14 years agoGRG21
The Android Automerger [Wed, 21 Jul 2010 15:29:37 +0000 (08:29 -0700)]
GRG21

Change-Id: I2a4e7f74ea8706233ab97a4b1b9f8831eb3287da

14 years agoadd phony target "all_modules" and use it as make goal for "mm"/"mmm"
Ying Wang [Tue, 20 Jul 2010 23:18:16 +0000 (16:18 -0700)]
add phony target "all_modules" and use it as make goal for "mm"/"mmm"

So that mm/mmm don't depend on phony target "files", which brings in
unwanted files for apps-only build.
Also allow "dist" for mmm.
Bug: http://b/issue?id=2811503

Change-Id: I2c0794aebd1d171d8a0f44eb8cda67855704d6bd

14 years agoGRG20
The Android Automerger [Tue, 20 Jul 2010 16:45:18 +0000 (09:45 -0700)]
GRG20

Change-Id: Ib98b9aa208b3e6a45c776b6d409413be3d33bcbb

14 years agoGRG19
The Android Automerger [Mon, 19 Jul 2010 15:34:08 +0000 (08:34 -0700)]
GRG19

Change-Id: I023eeabe08b60421c4fc544a1feedd2bc4f0c3f7

14 years agoFix sim build for unbundling native code
Ying Wang [Fri, 16 Jul 2010 18:34:36 +0000 (11:34 -0700)]
Fix sim build for unbundling native code

NDK does not support sim build.

Change-Id: I57a09c0083126c57a99cf33c055edef3390d1c28

14 years agoGRG16
The Android Automerger [Fri, 16 Jul 2010 15:18:59 +0000 (08:18 -0700)]
GRG16

Change-Id: I39fe307b0c3938981b3507fa10d64dd6825517cb

14 years agoMerge branch 'gingerbread' into gingerbread-release
The Android Automerger [Fri, 16 Jul 2010 15:18:27 +0000 (08:18 -0700)]
Merge branch 'gingerbread' into gingerbread-release

14 years agoDo a full clean build because of the installclean improvement steps
Joe Onorato [Fri, 16 Jul 2010 00:02:25 +0000 (17:02 -0700)]
Do a full clean build because of the installclean improvement steps

Change-Id: I8f8ec00667374cd1f5adad6ea4d737dac79be47f

14 years agoam 9269a711: docs: ensure code-ified links in qv are the proper color
Scott Main [Thu, 15 Jul 2010 23:43:38 +0000 (16:43 -0700)]
am 9269a711: docs: ensure code-ified links in qv are the proper color

Merge commit '9269a711753f2523acd3fe5ae661559f754a1bd0' into gingerbread

* commit '9269a711753f2523acd3fe5ae661559f754a1bd0':
  docs: ensure code-ified links in qv are the proper color

14 years agodocs: ensure code-ified links in qv are the proper color
Scott Main [Fri, 25 Jun 2010 23:09:24 +0000 (16:09 -0700)]
docs: ensure code-ified links in qv are the proper color

Change-Id: I61dd859e0749573746c9bfcbf224758463370ba7

14 years agoMerge "Instrumentation links against the jar file for its app, so use that at the...
Joe Onorato [Thu, 15 Jul 2010 18:07:42 +0000 (11:07 -0700)]
Merge "Instrumentation links against the jar file for its app, so use that at the dependency." into gingerbread

14 years agoMerge "Fix event-log-tags so we don't rebuild framework.jar because of an installclea...
Joe Onorato [Thu, 15 Jul 2010 18:07:35 +0000 (11:07 -0700)]
Merge "Fix event-log-tags so we don't rebuild framework.jar because of an installclean." into gingerbread

14 years agoMerge "The ICU data is no longer compiled directly into the shared library." into...
Joe Onorato [Thu, 15 Jul 2010 18:07:30 +0000 (11:07 -0700)]
Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread

14 years agoGRG15
The Android Automerger [Thu, 15 Jul 2010 15:44:36 +0000 (08:44 -0700)]
GRG15

Change-Id: Ic51e1429819ee10647188d1444fb73960ee8e38d

14 years agoMerge branch 'gingerbread' into gingerbread-release
The Android Automerger [Thu, 15 Jul 2010 15:44:06 +0000 (08:44 -0700)]
Merge branch 'gingerbread' into gingerbread-release

14 years agoInstrumentation links against the jar file for its app, so use that at the dependency.
Joe Onorato [Thu, 15 Jul 2010 02:49:05 +0000 (19:49 -0700)]
Instrumentation links against the jar file for its app, so use that at the dependency.

I don't remember exactly, but I think the dependencies for apps
were broken, and you couldn't reliably cause the java to be rebuilt
by depending just on the jar file-- you needed to depend on the
apk.  That isn't the case anymore, and relying on the apk means
that something built in out/target/common was depending on something
that's deleted by installclean.

With this change (and others), on my mac, the build after
installclean for passion-eng takes 2 minutes instead of 11.

Change-Id: Ib490f88292d591254013e07958961fc50ec2e3dc

14 years agoMerge "add an entry for the new libgui" into gingerbread
Mathias Agopian [Wed, 14 Jul 2010 23:31:43 +0000 (16:31 -0700)]
Merge "add an entry for the new libgui" into gingerbread

14 years agoGRG14B
The Android Automerger [Wed, 14 Jul 2010 23:29:50 +0000 (16:29 -0700)]
GRG14B

Change-Id: Ibfb3a313142fb7f2b9aecea7e9bceda0f21aeb46

14 years agoMerge branch 'gingerbread' into gingerbread-release
The Android Automerger [Wed, 14 Jul 2010 23:29:36 +0000 (16:29 -0700)]
Merge branch 'gingerbread' into gingerbread-release

14 years agoam a0cb4666: Merge "merge from open-source froyo" into froyo
Jean-Baptiste Queru [Wed, 14 Jul 2010 18:29:08 +0000 (11:29 -0700)]
am a0cb4666: Merge "merge from open-source froyo" into froyo

Merge commit 'a0cb466645ccc88d4f6d1f83018d5a0daf2eec6a' into gingerbread

* commit 'a0cb466645ccc88d4f6d1f83018d5a0daf2eec6a':
  Build Accessibility Tests and APK

14 years agoMerge "merge from open-source froyo" into froyo
Jean-Baptiste Queru [Wed, 14 Jul 2010 18:06:23 +0000 (11:06 -0700)]
Merge "merge from open-source froyo" into froyo

14 years agoFix event-log-tags so we don't rebuild framework.jar because of an installclean.
Joe Onorato [Wed, 14 Jul 2010 17:22:54 +0000 (10:22 -0700)]
Fix event-log-tags so we don't rebuild framework.jar because of an installclean.

Produce an event logs tag file for everything we know about, in order
to properly allocate numbers.  Then produce a file that's filtered
for what's going to be installed.

Change-Id: Id0778aec0b4d045e8ff91ba2c9c8265e860eaba5

14 years agoGRG14
The Android Automerger [Wed, 14 Jul 2010 15:17:49 +0000 (08:17 -0700)]
GRG14

Change-Id: I29e738e10263ab0dfbaaa633658214d7b67ee98c

14 years agoMerge branch 'gingerbread' into gingerbread-release
The Android Automerger [Wed, 14 Jul 2010 15:17:37 +0000 (08:17 -0700)]
Merge branch 'gingerbread' into gingerbread-release

14 years agoadd an entry for the new libgui
Mathias Agopian [Wed, 14 Jul 2010 05:26:21 +0000 (22:26 -0700)]
add an entry for the new libgui

libgui is for high level C++ frameworks, it can depend on the
binder (unlike libui).

Change-Id: I4a1ebc69284919c85dce03e1395578af2fd08aa8

14 years agoThe ICU data is no longer compiled directly into the shared library.
Joe Onorato [Wed, 14 Jul 2010 02:05:37 +0000 (19:05 -0700)]
The ICU data is no longer compiled directly into the shared library.

Change-Id: I79accedc16d6e62a95c0ec6f08ad2538013cd0b3

14 years agoresolved conflicts for merge of a6bed2f7 to gingerbread
Ying Wang [Wed, 14 Jul 2010 01:59:56 +0000 (18:59 -0700)]
resolved conflicts for merge of a6bed2f7 to gingerbread

Change-Id: Ic9efcc70af22f15a1bb136f70a30db59dc629e03

14 years agoMerge "Add phony target dist_libraries" into froyo
Ying Wang [Wed, 14 Jul 2010 01:50:05 +0000 (18:50 -0700)]
Merge "Add phony target dist_libraries" into froyo

14 years agoam b6a1c180: Keep the crt start/end var name of sh consistent with other archs
Ying Wang [Wed, 14 Jul 2010 00:46:29 +0000 (17:46 -0700)]
am b6a1c180: Keep the crt start/end var name of sh consistent with other archs

Merge commit 'b6a1c1802961f40fe4736e80402f849968cd2563' into gingerbread

* commit 'b6a1c1802961f40fe4736e80402f849968cd2563':
  Keep the crt start/end var name of sh consistent with other archs

14 years agoKeep the crt start/end var name of sh consistent with other archs
Ying Wang [Wed, 14 Jul 2010 00:41:14 +0000 (17:41 -0700)]
Keep the crt start/end var name of sh consistent with other archs

So that the PRIVATE_ vars get values correctly.

Change-Id: I1eea67f02c5bab5018b3b5fd93904e1ee8643bf7

14 years agoresolved conflicts for merge of 1a08100f to gingerbread
Ying Wang [Wed, 14 Jul 2010 00:21:33 +0000 (17:21 -0700)]
resolved conflicts for merge of 1a08100f to gingerbread

Change-Id: I9e4183a1d5c0efb13de8655b9eb7c74d50b34cd7

14 years agoSupport to build native libraries with prebuilt NDK
Ying Wang [Tue, 13 Jul 2010 21:55:47 +0000 (14:55 -0700)]
Support to build native libraries with prebuilt NDK

Bug: http://b/issue?id=2811253
Change-Id: Iabd4ab8b3d7236dffe89f1939e1142e882944026

14 years agomerge from open-source froyo
The Android Open Source Project [Tue, 13 Jul 2010 22:24:07 +0000 (15:24 -0700)]
merge from open-source froyo

Change-Id: I2759c464efef13754154310d10816a5781243311

14 years agoGRG13
The Android Automerger [Tue, 13 Jul 2010 15:17:36 +0000 (08:17 -0700)]
GRG13

Change-Id: Ieee9e0567310b0f7fce3ecb569c0f2558927fa0b

14 years agoGRG12
The Android Automerger [Mon, 12 Jul 2010 15:17:34 +0000 (08:17 -0700)]
GRG12

Change-Id: Iaf4d1bc4106c1601189448d3e24c41316ea226fe

14 years agoMerge branch 'gingerbread' into gingerbread-release
The Android Automerger [Mon, 12 Jul 2010 15:17:19 +0000 (08:17 -0700)]
Merge branch 'gingerbread' into gingerbread-release

14 years agoMerge "Enforce 64-bit build environment" into gingerbread
Ying Wang [Fri, 9 Jul 2010 20:30:14 +0000 (13:30 -0700)]
Merge "Enforce 64-bit build environment" into gingerbread

14 years agoGRG09
The Android Automerger [Fri, 9 Jul 2010 15:16:47 +0000 (08:16 -0700)]
GRG09

Change-Id: I5e70289cade506e739a4ef8ab91346019d45f234

14 years agoGRG08B
The Android Automerger [Thu, 8 Jul 2010 23:20:24 +0000 (16:20 -0700)]
GRG08B

Change-Id: Ib033283a7cca90160750ec8a6b1f20ba48e22cdb

14 years agoMerge branch 'gingerbread' into gingerbread-release
The Android Automerger [Thu, 8 Jul 2010 23:20:12 +0000 (16:20 -0700)]
Merge branch 'gingerbread' into gingerbread-release

14 years agoBuild Accessibility Tests and APK
Brian Muramatsu [Thu, 8 Jul 2010 20:05:09 +0000 (13:05 -0700)]
Build Accessibility Tests and APK

Bug 2814482

Froyo's cts.mk was missing two lines added to Eclair's cts.mk that
are needed to build the accessibility tests and apk.

Change-Id: I05f93bc0a56b2ec1e07eab8c7a15ef7d4bb90d18

14 years agoam b66a5c05: docs: modify redirect link text
Scott Main [Thu, 8 Jul 2010 18:42:13 +0000 (11:42 -0700)]
am b66a5c05: docs: modify redirect link text

Merge commit 'b66a5c0574e14b838d9dc2497540ffc6cb73dc4f' into gingerbread

* commit 'b66a5c0574e14b838d9dc2497540ffc6cb73dc4f':
  docs: modify redirect link text

14 years agodocs: modify redirect link text
Scott Main [Thu, 8 Jul 2010 18:29:28 +0000 (11:29 -0700)]
docs: modify redirect link text

Change-Id: Ieb26c4278958624b9c7aa8795cd7a8cab87fafec

14 years agoEnforce 64-bit build environment
Ying Wang [Thu, 8 Jul 2010 01:12:25 +0000 (18:12 -0700)]
Enforce 64-bit build environment

We will only support 64-bit build environment from now on.

Change-Id: Ic58cb3e06e7fc9cf19a65e6c05c26f12ff9886b7

14 years agoGRG08
The Android Automerger [Thu, 8 Jul 2010 15:17:05 +0000 (08:17 -0700)]
GRG08

Change-Id: Ieff66aa54f46aaed7094029d04ae4e93e6602a74

14 years agoMerge branch 'gingerbread' into gingerbread-release
The Android Automerger [Thu, 8 Jul 2010 15:16:51 +0000 (08:16 -0700)]
Merge branch 'gingerbread' into gingerbread-release

14 years agoFix broken interaction of JarJar and Emma.
Steve Howard [Wed, 7 Jul 2010 21:07:24 +0000 (14:07 -0700)]
Fix broken interaction of JarJar and Emma.

JarJar, like DX, can't handle the local var corruption that Emma
performs.  To fix this, I'm moving the JarJar step before the Emma
step.

Couple other minor changes:
* Improved the comment about emma hardcoding its output filename,
  since this took me about an hour to track down.
* Changed one line from "Copying $<" to "Copying $@".  It seems to be
  the convention that such lines print the destination, not the
  source, so I made it consistent.

Change-Id: I9f5c36b4f5af15daf15025b89860e942f15bb668

14 years agoAdd phony target dist_libraries
Ying Wang [Wed, 7 Jul 2010 23:57:28 +0000 (16:57 -0700)]
Add phony target dist_libraries

that is only used to put your library into the dist dir when doing a full build.

Change-Id: I11e9dc15237086843ea4a00736c81ffc680ca12e

14 years agoMerge "Clean up warnings in soslim" into gingerbread
David Turner [Wed, 7 Jul 2010 21:14:19 +0000 (14:14 -0700)]
Merge "Clean up warnings in soslim" into gingerbread

14 years agoGRG07
The Android Automerger [Wed, 7 Jul 2010 15:21:14 +0000 (08:21 -0700)]
GRG07

Change-Id: I139ab17d7e3a812f57c6cbc2bfd1a03673d6170e

14 years agoGRG06
The Android Automerger [Tue, 6 Jul 2010 15:10:34 +0000 (08:10 -0700)]
GRG06

Change-Id: I3af337f53801388f7eef30c3516c61de96a92617

14 years agoMerge branch 'gingerbread' into gingerbread-release
The Android Automerger [Tue, 6 Jul 2010 15:08:29 +0000 (08:08 -0700)]
Merge branch 'gingerbread' into gingerbread-release

14 years agoGRG02
The Android Automerger [Fri, 2 Jul 2010 15:38:05 +0000 (08:38 -0700)]
GRG02

Change-Id: I6017bbc4fc47a649f7b58bc45dcebe2e82a31f6d

14 years agoresolve conflicts in build_id.mk
android-build SharedAccount [Fri, 2 Jul 2010 15:34:56 +0000 (08:34 -0700)]
resolve conflicts in build_id.mk

Change-Id: I06a86ec9e2c22b8f948d3dd8041081373d222131

14 years agoManual merge of change 50994 from master (DO NOT MERGE)
Steve Howard [Mon, 3 May 2010 22:01:38 +0000 (15:01 -0700)]
Manual merge of change 50994 from master (DO NOT MERGE)

Merging from master because I'm bringing my maps API work into
gingerbread.

Fix and enable JarJar in Java builds.

java.mk contained a target to enable JarJar in Java builds, but it was
being bypassed.  This change enabled JarJar as part of the build
process, and fixes a slight bug with the way it was set up.

Change-Id: I814e64eb30b41bf249a63d683c03040e2658fe0d

14 years agoAdd ramdisk.img to the dist dir, again (was removed at some point) - from master...
Ed Heyl [Thu, 1 Jul 2010 17:23:20 +0000 (10:23 -0700)]
Add ramdisk.img to the dist dir, again (was removed at some point) - from master - please do no merge
b/2590492 and requested again

Change-Id: I1f4efac2a8ca47f1b69761bb9233427e0ca0411d

14 years agoam 783f449b: Don\'t copy apns-conf.xml for apps-only build
Ying Wang [Wed, 30 Jun 2010 23:34:52 +0000 (16:34 -0700)]
am 783f449b: Don\'t copy apns-conf.xml for apps-only build

Merge commit '783f449bdc0fe8aa9f2385c22bb0831fa3d5d1c9' into gingerbread

* commit '783f449bdc0fe8aa9f2385c22bb0831fa3d5d1c9':
  Don't copy apns-conf.xml for apps-only build

14 years agoDon't copy apns-conf.xml for apps-only build
Ying Wang [Wed, 30 Jun 2010 22:21:27 +0000 (15:21 -0700)]
Don't copy apns-conf.xml for apps-only build

http://b/issue?id=2796939
This can fix commands mm and mmm in an unbundled branch.
The cause is that mm & mmm depends on phony target "files", which includes apns-conf.xml.

Change-Id: I72ce1c7c5ddfdcd3bbea5cb9645ca3a48ff8ac12

14 years agoMerge "Change branch name to gingerbread, to match reality - DO NOT MERGE" into ginge...
Jean-Baptiste Queru [Wed, 30 Jun 2010 15:58:32 +0000 (08:58 -0700)]
Merge "Change branch name to gingerbread, to match reality - DO NOT MERGE" into gingerbread

14 years agoGRF91
The Android Automerger [Wed, 30 Jun 2010 15:22:10 +0000 (08:22 -0700)]
GRF91

Change-Id: Ib5661481431a8353adfa34ec5ee78223cd1cc576

14 years agoMerge branch 'gingerbread' into gingerbread-release
The Android Automerger [Wed, 30 Jun 2010 15:21:39 +0000 (08:21 -0700)]
Merge branch 'gingerbread' into gingerbread-release

14 years agoset up fast-forward from froyo-release to gingerbread
The Android Open Source Project [Tue, 29 Jun 2010 21:34:16 +0000 (14:34 -0700)]
set up fast-forward from froyo-release to gingerbread

Change-Id: I91ef2a183f34b54405580498a3cab39ec6dc7f24

14 years agoam 0af605f3: Merge "Allow to override --version-code and --version-name in LOCAL_AAPT...
Ying Wang [Tue, 29 Jun 2010 16:28:56 +0000 (09:28 -0700)]
am 0af605f3: Merge "Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS" into froyo

Merge commit '0af605f3b6e759f480a5124dc6b338ec58e1d40c' into gingerbread

* commit '0af605f3b6e759f480a5124dc6b338ec58e1d40c':
  Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS

14 years agoMerge "Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS" into...
Ying Wang [Tue, 29 Jun 2010 16:18:00 +0000 (09:18 -0700)]
Merge "Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS" into froyo

14 years agoGRF90
The Android Automerger [Tue, 29 Jun 2010 15:17:15 +0000 (08:17 -0700)]
GRF90

Change-Id: I1a3d96f86e688e1f280bdcd6bb9059df0526b30a

14 years agoGRF89
The Android Automerger [Mon, 28 Jun 2010 15:18:58 +0000 (08:18 -0700)]
GRF89

Change-Id: I38695a2b2072dcbe5cb479bc0a06de40de04c415

14 years agoMerge branch 'gingerbread' into gingerbread-release
The Android Automerger [Mon, 28 Jun 2010 15:16:42 +0000 (08:16 -0700)]
Merge branch 'gingerbread' into gingerbread-release

14 years agoClean up warnings in soslim
Kenny Root [Sun, 27 Jun 2010 05:39:38 +0000 (22:39 -0700)]
Clean up warnings in soslim

Change-Id: I497745fe9701876272fdbe7a946622a40efffdd5

14 years agoMerge "Enable shared libraries to use crtbegin_so.S and crtend_so.S" into gingerbread
David 'Digit' Turner [Fri, 25 Jun 2010 17:42:42 +0000 (10:42 -0700)]
Merge "Enable shared libraries to use crtbegin_so.S and crtend_so.S" into gingerbread

14 years agoGRF86
The Android Automerger [Fri, 25 Jun 2010 15:16:08 +0000 (08:16 -0700)]
GRF86

Change-Id: Icbc8dace89da08920a9d6d585899e01663858c7f

14 years agoMerge branch 'gingerbread' into gingerbread-release
The Android Automerger [Fri, 25 Jun 2010 15:15:53 +0000 (08:15 -0700)]
Merge branch 'gingerbread' into gingerbread-release

14 years agoam 81b68ad9: Merge "docs: show the download message on the SDK homepage because we...
Scott Main [Fri, 25 Jun 2010 01:12:45 +0000 (18:12 -0700)]
am 81b68ad9: Merge "docs: show the download message on the SDK homepage because we no longer need to walk through the TOS" into froyo

Merge commit '81b68ad95d6a8ecb8a44ad453d336dff3a059488' into gingerbread

* commit '81b68ad95d6a8ecb8a44ad453d336dff3a059488':
  docs: show the download message on the SDK homepage because we no longer

14 years agoMerge "docs: show the download message on the SDK homepage because we no longer need...
Scott Main [Fri, 25 Jun 2010 01:10:32 +0000 (18:10 -0700)]
Merge "docs: show the download message on the SDK homepage because we no longer need to walk through the TOS" into froyo