OSDN Git Service
Ying Wang [Wed, 25 Aug 2010 16:32:00 +0000 (09:32 -0700)]
Merge "Link against Mac OSX 10.5 SDK if building on 10.6." into gingerbread
Rohit Mungee [Wed, 25 Aug 2010 05:58:30 +0000 (22:58 -0700)]
Merge "Add support for multiple html directories to droiddoc." into gingerbread
Bill Napier [Wed, 25 Aug 2010 05:16:01 +0000 (22:16 -0700)]
Add support for multiple html directories to droiddoc.
The goal for adding this support is to allow droiddoc to pull html
files both from the static content and from content generated at
build time.
Change-Id: I5d4b2432aa78b0b3559daacedfb7a29675701f33
Ying Wang [Wed, 25 Aug 2010 01:33:22 +0000 (18:33 -0700)]
Link against Mac OSX 10.5 SDK if building on 10.6.
So that tools built on Snow Leopard (10.6) can be used on Leopard (10.5).
Change-Id: I99745ecbe2ad11feaae31d5be31c34c2e0ad7cc5
Ying Wang [Tue, 24 Aug 2010 18:18:07 +0000 (11:18 -0700)]
Disable CheckSize on ext partitions to fix build [DO NOT MERGE]
Original CL: 59920
Change-Id: I81437996670a61e10284293d25a08da8907ad296
Jean-Baptiste Queru [Tue, 24 Aug 2010 02:07:41 +0000 (19:07 -0700)]
merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Change-Id: Ic1040aa7e00cdc01af2f2cb4c741bafe4936904c
Ying Wang [Mon, 23 Aug 2010 19:56:25 +0000 (12:56 -0700)]
Pass pagesize to makebootimage.
Change-Id: I719d765245469921de105430fdd92d478ea48e82
Ying Wang [Mon, 23 Aug 2010 18:34:40 +0000 (11:34 -0700)]
Backport ext4 support from master [DO NOT MERGE]
ext4 support is needed by crespo.
Change-Id: I604cb9ada526ce8ba6b3648171ac1d614a5519a9
Ying Wang [Sat, 21 Aug 2010 23:49:07 +0000 (16:49 -0700)]
Restore OTA for crespo. [DO NOT MERGE]
Change-Id: I2472942741bdb2e4fa5037883f6acbe6c4ca36c3
Jean-Baptiste Queru [Sat, 21 Aug 2010 02:19:00 +0000 (19:19 -0700)]
Better way to disable OTAs for crespo - DO NOT MERGE
OTAs need to be disabled for all products using crespo
hardware, not just a single one.
Change-Id: I961462e5e87bec8c59dafa13dbf0fdc96bab29ab
Ying Wang [Fri, 20 Aug 2010 23:45:19 +0000 (16:45 -0700)]
Disable OTA for crespo [DO NOT MERGE]
Change-Id: I22c29226bb783fed34766e91d43edcf6e61a837f
android-build SharedAccount [Fri, 20 Aug 2010 16:21:16 +0000 (09:21 -0700)]
FRG51
Change-Id: Ifa272e3b63d85a5b25a43e3869fea4e62ea0d037
android-build SharedAccount [Wed, 18 Aug 2010 21:38:05 +0000 (14:38 -0700)]
FRG49
Change-Id: Ibf2fb1a5f077bda95006ffcccf3208ac53a4835d
android-build SharedAccount [Wed, 18 Aug 2010 15:45:04 +0000 (08:45 -0700)]
am
817a8ac9: (-s ours) bump version from 2.2 to 2.2.1 for next froyo release
Merge commit '
817a8ac99392228f894d18ea40b0fb4c1b6ca8fe' into gingerbread
* commit '
817a8ac99392228f894d18ea40b0fb4c1b6ca8fe':
bump version from 2.2 to 2.2.1 for next froyo release
android-build SharedAccount [Wed, 18 Aug 2010 05:44:17 +0000 (22:44 -0700)]
bump version from 2.2 to 2.2.1 for next froyo release
Change-Id: Ic636f111d4a7a69954539bbd480b7119bf0d730f
android-build SharedAccount [Wed, 18 Aug 2010 05:44:17 +0000 (22:44 -0700)]
bump version from 2.2 to 2.2.1 for next froyo release
Change-Id: Ic636f111d4a7a69954539bbd480b7119bf0d730f
android-build SharedAccount [Fri, 13 Aug 2010 18:49:07 +0000 (11:49 -0700)]
FRG22D
Change-Id: Ia5abcd21305a9ee7f646023401e59cb5bb35c700
android-build SharedAccount [Wed, 11 Aug 2010 19:23:53 +0000 (12:23 -0700)]
FRG22C
Change-Id: I222497bad7b4eff02a05393678b2e07fc260c55a
android-build SharedAccount [Wed, 11 Aug 2010 05:04:39 +0000 (22:04 -0700)]
FRG22B
Change-Id: I0e01dccb378cec768ea51e1454b1c50c8a1a7b75
Hung-ying Tyan [Tue, 10 Aug 2010 09:50:25 +0000 (17:50 +0800)]
Make ProGuard keep necessary members for serializable classes
Change-Id: I845eb8280d0cab7e426b17c94d74bc409e66c193
Chung-yih Wang [Fri, 6 Aug 2010 02:35:35 +0000 (19:35 -0700)]
Merge "Add voip(SIP related codes) into framework." into gingerbread
Scott Main [Thu, 5 Aug 2010 22:10:05 +0000 (15:10 -0700)]
am
4f2436dc: update carousel icon for nexus one dev phone
Merge commit '
4f2436dc3513f671935811bfa0c7e6c2c15505be' into gingerbread
* commit '
4f2436dc3513f671935811bfa0c7e6c2c15505be':
update carousel icon for nexus one dev phone
Scott Main [Thu, 5 Aug 2010 22:10:03 +0000 (15:10 -0700)]
am
7589398c: Merge "Doc change: Add nexus one to dev phones image." into froyo
Merge commit '
7589398cf9127987a768ccfb3dbb9cde54d00f02' into gingerbread
* commit '
7589398cf9127987a768ccfb3dbb9cde54d00f02':
Doc change: Add nexus one to dev phones image.
Scott Main [Thu, 5 Aug 2010 16:44:47 +0000 (09:44 -0700)]
update carousel icon for nexus one dev phone
Change-Id: I7f92063a7dc6b49dd6bb044b79931dbc9268ebd6
Scott Main [Thu, 5 Aug 2010 15:05:37 +0000 (08:05 -0700)]
Merge "Doc change: Add nexus one to dev phones image." into froyo
Brian Carlstrom [Thu, 5 Aug 2010 06:17:47 +0000 (23:17 -0700)]
Tracking merge of dalvik-dev to gingerbread
git cherry-pick --no-commit
f2f3e4b2
git cherry-pick --no-commit
b6a08f0cd36b12054ac73992a2737ea294387116
git cherry-pick --no-commit
d05d74b2d6f717ee25ca14c913ea7610c030ecd1
git cherry-pick --no-commit
5479d77e320420ef0cd7250d1a6729839ef907ce
Change-Id: I6f339aa73823e053146719b3af7af91d5375df1c
Chung-yih Wang [Thu, 5 Aug 2010 03:31:07 +0000 (11:31 +0800)]
Add voip(SIP related codes) into framework.
Change-Id: I12bbeb3dacd51b0234872529479e61bdd8536629
android-build SharedAccount [Wed, 4 Aug 2010 05:24:15 +0000 (22:24 -0700)]
33b special
Change-Id: I025cf8d2db61752e6816a3ca726445fd869bbc57
android-build SharedAccount [Mon, 2 Aug 2010 21:03:32 +0000 (14:03 -0700)]
FRG33
Change-Id: I04cafed766813daf17316651bf5403c3e4823a74
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
Ying Wang [Thu, 29 Jul 2010 17:21:15 +0000 (10:21 -0700)]
Merge "Dist apkcerts.txt for unbundled builds" into froyo
The Android Open Source Project [Wed, 28 Jul 2010 18:35:24 +0000 (11:35 -0700)]
The Android Open Source Project [Wed, 28 Jul 2010 18:24:38 +0000 (11:24 -0700)]
merge from open-source froyo
Change-Id: I947332f4e978326309fe14d01875ebfe94405c9f
The Android Open Source Project [Wed, 28 Jul 2010 17:40:27 +0000 (10:40 -0700)]
reconcile forked froyos
Change-Id: Ie0ab94638cc4489d9644e17d26f0603578a011e7
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
The Android Open Source Project [Mon, 26 Jul 2010 19:02:01 +0000 (12:02 -0700)]
merge from open-source froyo
Change-Id: I6bac03b1f646ea171ee20f0e90d37f337d7987fa
Ying Wang [Fri, 23 Jul 2010 23:42:13 +0000 (16:42 -0700)]
Dist apkcerts.txt for unbundled builds
Change-Id: Ic381d846f020dc43f48f43581c0db5721f2e36f7
Dirk Dougherty [Fri, 23 Jul 2010 21:00:22 +0000 (14:00 -0700)]
Doc change: Add nexus one to dev phones image.
Change-Id: I39541b208ed4a2f7b7f48c42f37f3ccdfc05de02
Evan Charlton [Fri, 23 Jul 2010 19:21:48 +0000 (12:21 -0700)]
resolved conflicts for merge of
121a7873 to gingerbread
Change-Id: I7b5cecd4236f263c31d4af73d929ff6b5729089e
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
android-build SharedAccount [Fri, 23 Jul 2010 05:16:06 +0000 (22:16 -0700)]
FRG22
Change-Id: Ie91f0556bd5e89e8b6640f0a7de1b914558bb564
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
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
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
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"
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
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
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
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
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
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
android-build SharedAccount [Thu, 15 Jul 2010 21:47:25 +0000 (14:47 -0700)]
FRG15B
Change-Id: Ife2aad69ca5f79a53a85d486da8d7db552891dc4
android-build SharedAccount [Thu, 15 Jul 2010 18:50:11 +0000 (11:50 -0700)]
FRG15
Change-Id: I7ae45fe90f1570b9d4f5a44856be6e37a9c9cc43
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
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
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
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
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
Mathias Agopian [Wed, 14 Jul 2010 23:31:43 +0000 (16:31 -0700)]
Merge "add an entry for the new libgui" into gingerbread
android-build SharedAccount [Wed, 14 Jul 2010 20:43:00 +0000 (13:43 -0700)]
FRG01B
Change-Id: Ifa90c748110a60cc2c6af8ced9249d66bed45f35
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
Jean-Baptiste Queru [Wed, 14 Jul 2010 18:06:23 +0000 (11:06 -0700)]
Merge "merge from open-source froyo" into froyo
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
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
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
Ying Wang [Wed, 14 Jul 2010 01:59:56 +0000 (18:59 -0700)]
resolved conflicts for merge of
a6bed2f7 to gingerbread
Change-Id: Ic9efcc70af22f15a1bb136f70a30db59dc629e03
Ying Wang [Wed, 14 Jul 2010 01:50:05 +0000 (18:50 -0700)]
Merge "Add phony target dist_libraries" into froyo
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
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
Ying Wang [Wed, 14 Jul 2010 00:21:33 +0000 (17:21 -0700)]
resolved conflicts for merge of
1a08100f to gingerbread
Change-Id: I9e4183a1d5c0efb13de8655b9eb7c74d50b34cd7
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
The Android Open Source Project [Tue, 13 Jul 2010 22:24:07 +0000 (15:24 -0700)]
merge from open-source froyo
Change-Id: I2759c464efef13754154310d10816a5781243311
Ying Wang [Fri, 9 Jul 2010 20:30:14 +0000 (13:30 -0700)]
Merge "Enforce 64-bit build environment" into gingerbread
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
android-build SharedAccount [Thu, 8 Jul 2010 19:00:07 +0000 (12:00 -0700)]
FRG08
Change-Id: I49aabebfdebc376e10dd7b6ed7dda80b054d7c60
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
Scott Main [Thu, 8 Jul 2010 18:29:28 +0000 (11:29 -0700)]
docs: modify redirect link text
Change-Id: Ieb26c4278958624b9c7aa8795cd7a8cab87fafec
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
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
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
David Turner [Wed, 7 Jul 2010 21:14:19 +0000 (14:14 -0700)]
Merge "Clean up warnings in soslim" into gingerbread
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
android-build SharedAccount [Thu, 1 Jul 2010 21:10:35 +0000 (14:10 -0700)]
FRG01
Change-Id: I41da481bf1dafdbc9009ecc86a0545209df3b193
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
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
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
android-build SharedAccount [Wed, 30 Jun 2010 20:30:23 +0000 (13:30 -0700)]
FRF81
Change-Id: I0be958683caa6458a5377b1265a7e3860122faad
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
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
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
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
Kenny Root [Sun, 27 Jun 2010 05:39:38 +0000 (22:39 -0700)]
Clean up warnings in soslim
Change-Id: I497745fe9701876272fdbe7a946622a40efffdd5
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
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
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
Ying Wang [Fri, 25 Jun 2010 00:59:32 +0000 (17:59 -0700)]
am
c048c9b5: default empty tapas to TARGET_BUILD_APPS "all"
Merge commit '
c048c9b598b36dc7506a954cc0d3d80f308b1b13' into gingerbread
* commit '
c048c9b598b36dc7506a954cc0d3d80f308b1b13':
default empty tapas to TARGET_BUILD_APPS "all"
Scott Main [Thu, 24 Jun 2010 23:36:54 +0000 (16:36 -0700)]
docs: show the download message on the SDK homepage because we no longer
need to walk through the TOS
Change-Id: I46f7e7284792b2bea77cf2a88b195e8117b4e4d2
android-build SharedAccount [Thu, 24 Jun 2010 23:06:16 +0000 (16:06 -0700)]
frf85B
Change-Id: I012a38642e8f0685d9811ec1a4dcb6e3d59d19bd
Ying Wang [Thu, 24 Jun 2010 22:08:33 +0000 (15:08 -0700)]
default empty tapas to TARGET_BUILD_APPS "all"
So that "tapas" without argument won't end in makefile-could-not-load error in unbundled branch.
Also, the magic "all" apps will build only apps, not other things.
Change-Id: Iac6dd928ee4e42996147acdab31930cd4ffa1768
Andy McFadden [Thu, 24 Jun 2010 19:52:51 +0000 (12:52 -0700)]
Ignore STAY_OFF_MY_LAWN when setting JAVA_HOME.
Don't check STAY_OFF_MY_LAWN in set_java_home. That function already
refuses to update JAVA_HOME if it's set to something, which should
be sufficient for anybody who doesn't want the script to mess with it.
With this change, you can get the benefits of the 1.5/1.6 auto-selection
without having to suffer through window title changes.
Change-Id: I5cfc5d6fdf26a10b42b52925f877012c0506b9a5