Commit Graph

2352 Commits

Author SHA1 Message Date
Ying Wang fa9ae7bbbe 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.
2010-03-03 13:08:28 -08:00
Daniel Sandler b7aa96bf8e Switch to Launcher2 for all builds.
Change-Id: I0a0af777bc290224c72511abfbc8ed60f8ef2174
2010-03-03 12:50:43 -08:00
The Android Automerger 71fecd1f27 FRE62 2010-03-03 08:11:55 -08:00
The Android Automerger 8b7721b8ef Merge branch 'master' into froyo-release 2010-03-03 08:11:41 -08:00
Marco Nelissen 6323bd93cc Cleanspec for switching from Music2 back to Music 2010-03-02 13:44:32 -08:00
Ying Wang f47dc0638a Merge "Turn on Proguard by default for user/userdebug builds." 2010-03-02 09:41:13 -08:00
The Android Automerger 81b8571aef FRE61 2010-03-02 08:11:22 -08:00
The Android Automerger 141dfd2003 Merge branch 'master' into froyo-release 2010-03-02 08:11:08 -08:00
Ficus Kirkpatrick 384ab7acf4 Merge "Make cgrep look for *.c, *.cc, *.cpp, *.h exclusively." 2010-03-01 17:02:01 -08:00
Ficus Kirkpatrick 8889bdf39c 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
2010-03-01 16:51:47 -08:00
Jean-Baptiste Queru 518ce5753a 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
2010-03-01 16:22:10 -08:00
Doug Zongker 0622e322b1 am b87e0e1d: (-s ours) Merge commit \'27bb6f5f\' into manualmerge
Merge commit 'b87e0e1d17299dcd1cdbcfbb80d680b5db8a8cd2'

* commit 'b87e0e1d17299dcd1cdbcfbb80d680b5db8a8cd2':
  add signing checker script to releasetools
2010-03-01 14:04:40 -08:00
Xavier Ducrohet a7c0784287 Merge "The builders project is gone. Remove it from main.mk" 2010-03-01 12:46:54 -08:00
Doug Zongker b87e0e1d17 Merge commit '27bb6f5f' into manualmerge 2010-03-01 12:36:07 -08:00
Doug Zongker 27bb6f5f23 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.)
2010-03-01 12:26:17 -08:00
David 'Digit' Turner 842aab4d46 Merge "Temporary fix for ARMv7 -user builds." 2010-03-01 11:35:22 -08:00
Jack Palevich 4ea454994c Add cleanspec for switching from Music to Music2. 2010-03-01 10:49:40 -08:00
The Android Automerger c9ef832fa7 FRE60B 2010-03-01 09:30:26 -08:00
The Android Automerger 5b1357a2c7 FRE60 2010-03-01 08:57:29 -08:00
The Android Automerger 4d758e4a94 Merge branch 'master' into froyo-release 2010-03-01 08:57:14 -08:00
Andy McFadden a5b1e4e1bb Merge "Tweak default x86 target arch variant." 2010-02-26 14:01:06 -08:00
Andy McFadden ef26218762 Tweak default x86 target arch variant.
Simply set the arch variant for sim-eng to be "x86".
2010-02-26 13:50:44 -08:00
android-build SharedAccount fc3bbded13 FRE56B 2010-02-25 16:04:47 -08:00
David 'Digit' Turner 171e0d0003 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.
2010-02-25 14:05:05 -08:00
Dianne Hackborn d0c997e0b6 Framework no longer links with android-common. 2010-02-25 10:44:45 -08:00
Jean-Baptiste Queru 55934c1766 Merge "Allow to explicitly compile the core build configuration" 2010-02-25 10:04:37 -08:00
The Android Automerger 729592b9c5 FRE56 2010-02-25 08:23:00 -08:00
The Android Automerger ffb02e2819 Merge branch 'master' into froyo-release 2010-02-25 08:22:48 -08:00
Jean-Baptiste Queru 75e3264867 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
2010-02-24 15:59:36 -08:00
Xavier Ducrohet b464b5e82e The builders project is gone. Remove it from main.mk
Change-Id: Ibec7be55667e83d635e1de990772e2730d0e75ff
2010-02-24 13:10:55 -08:00
Joe Onorato 03e2c09378 Merge "Make mmm handle symbolic links." 2010-02-24 11:39:55 -08:00
Andy McFadden 16e95bb99d 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
2010-02-24 08:33:08 -08:00
The Android Automerger 115faf5f72 FRE55 2010-02-24 08:12:09 -08:00
The Android Automerger 475c2e31b6 Merge branch 'master' into froyo-release 2010-02-24 08:11:48 -08:00
android-build SharedAccount 7ae98dee12 FRE54B 2010-02-23 16:21:26 -08:00
Niko Catania 5217f4db12 Merge "Added cleanup step for the switch to stlport for gtest" 2010-02-23 15:27:54 -08:00
Nicolas Catania f082dd34f5 Added cleanup step for the switch to stlport for gtest 2010-02-23 15:12:35 -08:00
Jean-Baptiste Queru 9b4a81237b 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
2010-02-23 12:36:56 -08:00
Andy McFadden e009f29590 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.
2010-02-23 10:24:33 -08:00
Jean-Baptiste Queru c3f42a9ae2 Allow to explicitly compile the core build configuration
Also add some missing copyright notices

Change-Id: I86873ad58f3dadbec8be741982bed548cb7e3c8e
2010-02-23 10:15:24 -08:00
Andy McFadden b94202f222 Merge "Provide default variant for x86." 2010-02-23 10:00:38 -08:00
The Android Automerger 4897f66525 FRE54 2010-02-23 08:17:55 -08:00
The Android Automerger a87f5ea0c4 Merge branch 'master' into froyo-release 2010-02-23 08:17:18 -08:00
Doug Zongker 6b2d0b05c0 Merge "pass blobs to applypatch in incremental OTAs" 2010-02-22 17:31:16 -08:00
Doug Zongker c8d446bcde 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
2010-02-22 15:41:53 -08:00
Andy McFadden 8d7c2b5c6d 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.
2010-02-22 12:44:04 -08:00
Jean-Baptiste Queru 22344e760f Merge "Allow optional product inheritance" 2010-02-22 10:52:59 -08:00
Joe Onorato 28a846d013 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
2010-02-22 10:39:17 -08:00
The Android Automerger 8e05800bb5 FRE53 2010-02-22 08:15:00 -08:00
The Android Automerger 6fcf082174 Merge branch 'master' into froyo-release 2010-02-22 08:14:38 -08:00