OSDN Git Service
The Android Automerger [Thu, 11 Mar 2010 18:03:11 +0000 (10:03 -0800)]
FRE70B
Change-Id: I296572951462f74f0962dd3ccc6c493f0eb95190
The Android Automerger [Thu, 11 Mar 2010 16:12:56 +0000 (08:12 -0800)]
FRE70
Change-Id: I69828a69fc21e856ff7d7f7aa7d5a82623bc332c
The Android Automerger [Thu, 11 Mar 2010 16:12:43 +0000 (08:12 -0800)]
Merge branch 'master' into froyo-release
Colin Cross [Thu, 11 Mar 2010 02:14:31 +0000 (18:14 -0800)]
Merge "Use ARCH_ARM_HAVE_ARMV7A to select qemu kernel for dexpreopt"
Colin Cross [Thu, 11 Mar 2010 02:14:03 +0000 (18:14 -0800)]
Merge changes Ib3b44e83,I70d50928
* changes:
Add a new build target armv7-a-neon
Modify the armv7-a target arch to not use NEON
Marco Nelissen [Thu, 11 Mar 2010 00:34:15 +0000 (16:34 -0800)]
Merge "Update warn.py with more warnings"
Ying Wang [Thu, 11 Mar 2010 00:20:32 +0000 (16:20 -0800)]
Merge "Don't force localization for package tagged as tests."
Marco Nelissen [Thu, 11 Mar 2010 00:16:02 +0000 (16:16 -0800)]
Update warn.py with more warnings
Change-Id: Ic65e6effe2be60d6a6c2a53c6acf356ad9e7ea94
Colin Cross [Tue, 9 Mar 2010 03:07:40 +0000 (19:07 -0800)]
Use ARCH_ARM_HAVE_ARMV7A to select qemu kernel for dexpreopt
Change-Id: I440d944e87324038e465415b1b71613b31052f99
Colin Cross [Tue, 9 Mar 2010 02:32:43 +0000 (18:32 -0800)]
Add a new build target armv7-a-neon
Change-Id: Ib3b44e839b093974aff0d595950e6b691beee7a5
Colin Cross [Tue, 9 Mar 2010 03:07:26 +0000 (19:07 -0800)]
Modify the armv7-a target arch to not use NEON
To build for a target with NEON, use armv7-a-neon
Change-Id: I70d509287b04c0faebe44faf6c8ebb28a7360ff9
Ying Wang [Thu, 11 Mar 2010 00:02:42 +0000 (16:02 -0800)]
Don't force localization for package tagged as tests.
Change-Id: I612598443371fc388cf08ddde7ebdd1d3dec9c7e
Ying Wang [Wed, 10 Mar 2010 21:36:42 +0000 (13:36 -0800)]
Merge "Let Proguard load emma jar if it's enabled."
The Android Automerger [Wed, 10 Mar 2010 16:13:02 +0000 (08:13 -0800)]
FRE69
Change-Id: I4865703a23a3ec4fe9d38d2707eb1c4680f5bf12
The Android Automerger [Wed, 10 Mar 2010 16:12:44 +0000 (08:12 -0800)]
Merge branch 'master' into froyo-release
Ying Wang [Wed, 10 Mar 2010 01:24:32 +0000 (17:24 -0800)]
Let Proguard load emma jar if it's enabled.
Change-Id: I57a0bcfb486339f48dc25f5fc5d44a1178dee678
See: http://b/issue?id=
2502181
The Android Automerger [Tue, 9 Mar 2010 16:13:17 +0000 (08:13 -0800)]
FRE68
Change-Id: I72c18298dbc6116282bd7df73ae4b90e27b06a76
The Android Automerger [Tue, 9 Mar 2010 16:12:53 +0000 (08:12 -0800)]
Merge branch 'master' into froyo-release
Bjorn Bringert [Tue, 9 Mar 2010 14:37:21 +0000 (14:37 +0000)]
Make ProGuard keep @VisibleForTesting classes and methods
Change-Id: I7f5d14fd4188859c52ab85c33af1ac275888611c
Jean-Baptiste Queru [Tue, 9 Mar 2010 02:04:03 +0000 (18:04 -0800)]
Add an empty CleanSpec.mk
Change-Id: Idc6adae88917383b19af0a7cfec88526cd6ac176
The Android Open Source Project [Tue, 9 Mar 2010 01:16:23 +0000 (17:16 -0800)]
merge from open-source master
Change-Id: I9fedeb014c946b53bfdd424b00c0cb5fc08f8333
Andy McFadden [Mon, 8 Mar 2010 20:42:46 +0000 (12:42 -0800)]
Added -lpthread to target LDFLAGS for sim-eng.
This adds "-lpthread" to TARGET_GLOBAL_LDFLAGS when TARGET_SIMULATOR
is true. This is much easier than inserting it into individual
makefiles as needed. Has no effect on other builds.
Should fix the sim-eng build breakage in libcameraservice.
Change-Id: I4dcd7d54b93d1be1622b8ce78a1662d28ca9f9f2
The Android Automerger [Mon, 8 Mar 2010 17:16:30 +0000 (09:16 -0800)]
FRE67
Change-Id: I34266bae07be0d7ca676b20227a539ef458ebded
The Android Automerger [Mon, 8 Mar 2010 17:16:08 +0000 (09:16 -0800)]
Merge branch 'master' into froyo-release
Dan Egnor [Fri, 5 Mar 2010 23:31:49 +0000 (15:31 -0800)]
Cleanspec rules to take care of old (pre-static) libraries.
(The build system doesn't react gracefully when something is switched
from a shared library to a static library.)
Andrew Stadler [Fri, 5 Mar 2010 20:45:52 +0000 (12:45 -0800)]
Fix builds due to Music2 moving around.
The Android Automerger [Fri, 5 Mar 2010 16:19:56 +0000 (08:19 -0800)]
FRE64
The Android Automerger [Fri, 5 Mar 2010 16:19:42 +0000 (08:19 -0800)]
Merge branch 'master' into froyo-release
Jean-Baptiste Queru [Fri, 5 Mar 2010 15:23:14 +0000 (07:23 -0800)]
Merge from eclair
Change-Id: I4496dadd8a738a05c647589ca78732e9b608ca29
Jean-Baptiste Queru [Fri, 5 Mar 2010 01:31:28 +0000 (17:31 -0800)]
Add provisioning app in the generic build
Change-Id: Iffdd4d21a3c55e7a73d58289fda31ac8a27a18ac
Jean-Baptiste Queru [Fri, 22 Jan 2010 21:25:24 +0000 (13:25 -0800)]
Look for product configs in device/ in addition to vendor/
This will allow to create open-sourceable product configurations.
Change-Id: I4e73347c2095935340bfc8c3737c2adf1ef22a9c
Romain Guy [Thu, 4 Mar 2010 20:01:58 +0000 (12:01 -0800)]
Add clean step for Launcher & Launcher2
The Android Automerger [Thu, 4 Mar 2010 17:31:34 +0000 (09:31 -0800)]
FRE63C
The Android Automerger [Thu, 4 Mar 2010 17:22:01 +0000 (09:22 -0800)]
FRE63B
The Android Automerger [Thu, 4 Mar 2010 16:58:16 +0000 (08:58 -0800)]
FRE63
The Android Automerger [Thu, 4 Mar 2010 16:58:01 +0000 (08:58 -0800)]
Merge branch 'master' into froyo-release
Dan Egnor [Thu, 4 Mar 2010 03:27:40 +0000 (19:27 -0800)]
Remove a bunch of obsolete/(potentially) renamed .apk's.
I found these kicking around my system/app with old timestamps, and old
packages just cause trouble. Depending on the build flavor they may or
may not still be there, but it's harmless to clean them.
Ying Wang [Wed, 3 Mar 2010 22:32:06 +0000 (14:32 -0800)]
Fix proguard_option_file.
Ying Wang [Wed, 3 Mar 2010 18:45:14 +0000 (10:45 -0800)]
Decentralizes cleanspecs.
After this change, you should add-clean-step at the end of CleanSpec.mk
in your project, instead of the centralized cleanspecs.mk in build/core.
Daniel Sandler [Tue, 2 Mar 2010 19:09:55 +0000 (14:09 -0500)]
Switch to Launcher2 for all builds.
Change-Id: I0a0af777bc290224c72511abfbc8ed60f8ef2174
The Android Automerger [Wed, 3 Mar 2010 16:11:55 +0000 (08:11 -0800)]
FRE62
The Android Automerger [Wed, 3 Mar 2010 16:11:41 +0000 (08:11 -0800)]
Merge branch 'master' into froyo-release
Marco Nelissen [Tue, 2 Mar 2010 21:44:32 +0000 (13:44 -0800)]
Cleanspec for switching from Music2 back to Music
Ying Wang [Tue, 2 Mar 2010 17:41:13 +0000 (09:41 -0800)]
Merge "Turn on Proguard by default for user/userdebug builds."
The Android Automerger [Tue, 2 Mar 2010 16:11:22 +0000 (08:11 -0800)]
FRE61
The Android Automerger [Tue, 2 Mar 2010 16:11:08 +0000 (08:11 -0800)]
Merge branch 'master' into froyo-release
Ficus Kirkpatrick [Tue, 2 Mar 2010 01:02:01 +0000 (17:02 -0800)]
Merge "Make cgrep look for *.c, *.cc, *.cpp, *.h exclusively."
Ficus Kirkpatrick [Tue, 2 Mar 2010 00:51:47 +0000 (16:51 -0800)]
Make cgrep look for *.c, *.cc, *.cpp, *.h exclusively.
It was doing '*.c*' which both included .class files and omitted .h files.
Change-Id: Iedaac4f7ee86df86fdc38341c04ca565f34223b4
Jean-Baptiste Queru [Tue, 2 Mar 2010 00:18:59 +0000 (16:18 -0800)]
De-dupe PRODUCT_COPY_FILES
This allows to explicitly deal with situations where we
want to use PRODUCT_COPY_FILES to manage overrides.
Change-Id: I2f87862e19b973f090099f335e9bdeb0c9f3bfe9
Doug Zongker [Mon, 1 Mar 2010 22:04:40 +0000 (14:04 -0800)]
am
b87e0e1d: (-s ours) Merge commit \'
27bb6f5f\' into manualmerge
Merge commit '
b87e0e1d17299dcd1cdbcfbb80d680b5db8a8cd2'
* commit '
b87e0e1d17299dcd1cdbcfbb80d680b5db8a8cd2':
add signing checker script to releasetools
Xavier Ducrohet [Mon, 1 Mar 2010 20:46:54 +0000 (12:46 -0800)]
Merge "The builders project is gone. Remove it from main.mk"
Doug Zongker [Mon, 1 Mar 2010 20:36:07 +0000 (12:36 -0800)]
Merge commit '
27bb6f5f' into manualmerge
Doug Zongker [Tue, 8 Dec 2009 21:46:44 +0000 (13:46 -0800)]
add signing checker script to releasetools
The check_target_files_signatures determines what key was used to sign
every .apk in a given target_files. It can compare that signature to
that of another target_files (eg, the previous release for that
device) and flag any problems such as .apks signed with a different
key.
(This is a backport of a change in froyo. It does not affect device
code, only the scripts that sign images and OTA packages.)
David 'Digit' Turner [Mon, 1 Mar 2010 19:35:22 +0000 (11:35 -0800)]
Merge "Temporary fix for ARMv7 -user builds."
Jack Palevich [Mon, 1 Mar 2010 18:49:40 +0000 (10:49 -0800)]
Add cleanspec for switching from Music to Music2.
The Android Automerger [Mon, 1 Mar 2010 17:30:26 +0000 (09:30 -0800)]
FRE60B
The Android Automerger [Mon, 1 Mar 2010 16:57:29 +0000 (08:57 -0800)]
FRE60
The Android Automerger [Mon, 1 Mar 2010 16:57:14 +0000 (08:57 -0800)]
Merge branch 'master' into froyo-release
Andy McFadden [Fri, 26 Feb 2010 22:01:06 +0000 (14:01 -0800)]
Merge "Tweak default x86 target arch variant."
Andy McFadden [Fri, 26 Feb 2010 21:26:03 +0000 (13:26 -0800)]
Tweak default x86 target arch variant.
Simply set the arch variant for sim-eng to be "x86".
android-build SharedAccount [Fri, 26 Feb 2010 00:04:47 +0000 (16:04 -0800)]
FRE56B
David 'Digit' Turner [Thu, 25 Feb 2010 22:05:05 +0000 (14:05 -0800)]
Temporary fix for ARMv7 -user builds.
This switches the emulator to "single step" emulation mode which is
slower but seems to work-around the current ARMv7 emulation bug.
This allows the dexreopt passes to go through normally.
Dianne Hackborn [Thu, 25 Feb 2010 04:05:38 +0000 (20:05 -0800)]
Framework no longer links with android-common.
Jean-Baptiste Queru [Thu, 25 Feb 2010 18:04:37 +0000 (10:04 -0800)]
Merge "Allow to explicitly compile the core build configuration"
The Android Automerger [Thu, 25 Feb 2010 16:23:00 +0000 (08:23 -0800)]
FRE56
The Android Automerger [Thu, 25 Feb 2010 16:22:48 +0000 (08:22 -0800)]
Merge branch 'master' into froyo-release
Jean-Baptiste Queru [Wed, 24 Feb 2010 23:57:23 +0000 (15:57 -0800)]
Don't build OTA package for aosp_emulator_us
This allows "make dist" to work on that configuration.
A better fix would be to allow each product to specify
whether it's an emulator target or a device target, and
to adapt to that, but that'd be a lot more intrusive.
Change-Id: I47708025204a4991466abceb1708a3020a543238
Xavier Ducrohet [Wed, 24 Feb 2010 21:10:55 +0000 (13:10 -0800)]
The builders project is gone. Remove it from main.mk
Change-Id: Ibec7be55667e83d635e1de990772e2730d0e75ff
Joe Onorato [Wed, 24 Feb 2010 19:39:55 +0000 (11:39 -0800)]
Merge "Make mmm handle symbolic links."
Andy McFadden [Wed, 24 Feb 2010 16:29:39 +0000 (08:29 -0800)]
Build the target side of the simulator as 32-bit.
This detail got lost in my previous cleanup change
9b4a812.
Also add a comment explaining why the host side of the
simulator needs to be built in 64-bit (wxWidgets).
Change-Id: I2a867f7f80b43d53e73348b19f6ae834600295f9
The Android Automerger [Wed, 24 Feb 2010 16:12:09 +0000 (08:12 -0800)]
FRE55
The Android Automerger [Wed, 24 Feb 2010 16:11:48 +0000 (08:11 -0800)]
Merge branch 'master' into froyo-release
android-build SharedAccount [Wed, 24 Feb 2010 00:21:26 +0000 (16:21 -0800)]
FRE54B
Niko Catania [Tue, 23 Feb 2010 23:27:54 +0000 (15:27 -0800)]
Merge "Added cleanup step for the switch to stlport for gtest"
Nicolas Catania [Tue, 23 Feb 2010 23:12:35 +0000 (15:12 -0800)]
Added cleanup step for the switch to stlport for gtest
Jean-Baptiste Queru [Tue, 23 Feb 2010 20:36:56 +0000 (12:36 -0800)]
Get rid of $(combo_target)
The only OS-ARCH combo that would have benefited from it
is linux-x86, but it explicitly used separate configurations
for the HOST_ and TARGET_ side of things.
This makes is clear which files are related to the HOST_
configuration and which ones are related to the TARGET_
configuration, and expands $(combo_target) to the only
possible/reasonable value that it could have had in every
file.
This also cleans up the simulator, by moving it in a single
place in TARGET_linux_x86 (since the only part that's special
is to use HOST_ settings even when building TARGET_ modules).
Change-Id: I2420eeb8cfe539f5807ec99cb3177ffb9f2476d5
Andy McFadden [Tue, 23 Feb 2010 18:24:33 +0000 (10:24 -0800)]
Fix build.
The "set default variant to armv5te if none defined" in the ARM config
was applying to all architectures, but as it turns out only ARM builds
actually cared. When I made a copy of the "set default" code to the x86
config, one or the other would win for builds that didn't specify a
variant. Turns out x86 won, so sim and voles worked, but opal didn't.
Jean-Baptiste Queru [Tue, 23 Feb 2010 17:52:18 +0000 (09:52 -0800)]
Allow to explicitly compile the core build configuration
Also add some missing copyright notices
Change-Id: I86873ad58f3dadbec8be741982bed548cb7e3c8e
Andy McFadden [Tue, 23 Feb 2010 18:00:38 +0000 (10:00 -0800)]
Merge "Provide default variant for x86."
The Android Automerger [Tue, 23 Feb 2010 16:17:55 +0000 (08:17 -0800)]
FRE54
The Android Automerger [Tue, 23 Feb 2010 16:17:18 +0000 (08:17 -0800)]
Merge branch 'master' into froyo-release
Doug Zongker [Tue, 23 Feb 2010 01:31:16 +0000 (17:31 -0800)]
Merge "pass blobs to applypatch in incremental OTAs"
Doug Zongker [Mon, 22 Feb 2010 23:41:53 +0000 (15:41 -0800)]
pass blobs to applypatch in incremental OTAs
applypatch now takes patches as blob-valued arguments instead of just
filenames, eliminating the need to unpack all patches to /tmp before
starting to apply them.
Revert the last change I made where sha1_check(read_file(...)) was
substituted for apply_patch_check(...). apply_patch_check() knows to
check /cache/saved.file if the original source file is missing or has
a bad checksum, which is important if the device loses power or
otherwise restarts during patching.
Change-Id: Ia5b761474b0f809a5a5eed29455b1b145145699e
Andy McFadden [Mon, 22 Feb 2010 20:44:04 +0000 (12:44 -0800)]
Provide default variant for x86.
The TARGET_ARCH_VARIANT was not being set for x86. This caused some
difficulties when x86-atom tried to include variant-specific versions
of files.
Jean-Baptiste Queru [Mon, 22 Feb 2010 18:52:59 +0000 (10:52 -0800)]
Merge "Allow optional product inheritance"
Joe Onorato [Mon, 22 Feb 2010 18:33:05 +0000 (10:33 -0800)]
Allow optional product inheritance
This allows to use a proper $(call inherit-product) across
the open-source -> non-open-source boundary in a way that
can automatically adapt to whether the non-open-source
part is present or not
Change-Id: I357721c68362ff8c0f90610850b0368adee68ada
The Android Automerger [Mon, 22 Feb 2010 16:15:00 +0000 (08:15 -0800)]
FRE53
The Android Automerger [Mon, 22 Feb 2010 16:14:38 +0000 (08:14 -0800)]
Merge branch 'master' into froyo-release
Ying Wang [Sat, 20 Feb 2010 02:39:13 +0000 (18:39 -0800)]
Turn on Proguard by default for user/userdebug builds.
The Android Automerger [Fri, 19 Feb 2010 23:33:21 +0000 (15:33 -0800)]
FRE50B
The Android Automerger [Fri, 19 Feb 2010 23:24:00 +0000 (15:24 -0800)]
FRE50
The Android Automerger [Fri, 19 Feb 2010 23:23:36 +0000 (15:23 -0800)]
Merge branch 'master' into froyo-release
Ben Cheng [Fri, 19 Feb 2010 22:49:11 +0000 (14:49 -0800)]
Clean up libdvm variants.
Doug Zongker [Fri, 19 Feb 2010 20:41:15 +0000 (12:41 -0800)]
Merge "relocate applypatch; check patch integrity"
Doug Zongker [Thu, 18 Feb 2010 00:09:18 +0000 (16:09 -0800)]
relocate applypatch; check patch integrity
- Delete the applypatch code (it's being moved to bootable/recovery).
- Change the OTA script generator to verify the sha1sum of all the
patch files after they are unpacked into /tmp.
b/
2361316 - VZW Issue PP628: Continuous reset to Droid logo:
framework-res.apk update failed (CR LIBtt59130)
Change-Id: I5858d48f10127f72e708d50d3de844569d1aff27
The Android Automerger [Fri, 19 Feb 2010 00:50:31 +0000 (16:50 -0800)]
FRE49D
The Android Automerger [Fri, 19 Feb 2010 00:50:11 +0000 (16:50 -0800)]
Merge branch 'master' into froyo-release
Fred Quintana [Fri, 19 Feb 2010 00:00:46 +0000 (16:00 -0800)]
Merge "remove obsolete property ro.config.sync"
The Android Automerger [Thu, 18 Feb 2010 21:15:35 +0000 (13:15 -0800)]
FRE49C
Doug Zongker [Thu, 18 Feb 2010 19:43:04 +0000 (11:43 -0800)]
fix makefile inheritance system
The variable inheritance system can leave extra spaces in a variable
when multiple levels of inheritance are used. It can expand:
"@inherit:foo @inherit:bar @inherit:baz"
to
"value @inherit:bar @inherit:baz"
and then
"value @inherit:baz" (if bar has no value for the variable)
and then
"value " (if baz also has no value).
Call strip to remove excess spaces between words after each
replacement pass.
Change-Id: Ic4cfc6fed1865066a6353a522e4bdcb68ec875d3