Commit graph

2051 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Ying Wang
85ab497a4e Turn on Proguard by default for user/userdebug builds. 2010-02-19 18:39:13 -08:00
Ben Cheng
1af09dea7c Clean up libdvm variants. 2010-02-19 14:49:11 -08:00
Doug Zongker
b2ee0fd5c0 Merge "relocate applypatch; check patch integrity" 2010-02-19 12:41:15 -08:00
Doug Zongker
5a48209541 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
2010-02-19 12:14:53 -08:00
Fred Quintana
577c5ba9f4 Merge "remove obsolete property ro.config.sync" 2010-02-18 16:00:46 -08:00
Doug Zongker
1d89773c1d 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
2010-02-18 12:23:35 -08:00
Chia-chi Yeh
84c253286f Merge "Remove dead shared objects from prelink map." 2010-02-17 20:44:53 -08:00
Chia-chi Yeh
74a7e06800 Remove dead shared objects from prelink map. 2010-02-18 12:11:10 +08:00
Gilles Debunne
8a20f580a8 Make mmm handle symbolic links.
Use the PWD= /bin/pwd trick used in getopt in mmm so that it can deal with a symlinked
root directory.

Change-Id: Ia8b5ef10cbd10ca05f2301db86f64fdf11ff2840
2010-02-17 15:56:45 -08:00
Fred Quintana
5dc8a65917 remove obsolete property ro.config.sync 2010-02-17 13:35:19 -08:00
Doug Zongker
7431dac607 allow java eventlogtags to be generated for packages that aren't included
If there are packages that specify logtags being built that aren't
included in the product, their logtags won't be included in the merged
file.  Assign an arbitrary tag number to them so they can be built
anyway.

Change-Id: I4929016bf289b7a814b48bc51f324c09f500fab1
2010-02-17 09:07:55 -08:00
Doug Zongker
7e2f13b43a build the event-log-tags file for the simulator
Change-Id: Idfbc8257e5e3651fe92649d59305f0e24ba60c91
2010-02-16 16:01:43 -08:00
Raphael Moll
d2827a1d6a Merge "Allow sdk/builders to be built using Windows SDK." 2010-02-16 15:20:25 -08:00
Raphael
719a123a58 Allow sdk/builders to be built using Windows SDK.
Change-Id: Ic3c8bc2bace166442bf780b625e5d528fea4df9f
2010-02-16 15:16:00 -08:00
Doug Zongker
abfbbe2e1d allow EventLog tag numbers to be auto-assigned
With this change, you can specify "?" in place of a tag number in a
.logtags file and the build system will assign numbers to these tags.
(The numbers used shouldn't matter since we translate them back to tag
names whenever the logs are read back.)

This is pretty straightforward to do:

- make merge-event-log-tags.py assign numbers to any tags that specify
  "?"

- make the generated java files depend on the merged output

- make java-event-log-tags.py read both the original .logtags and the
  merged output, and fill in tag numbers for any "?" using the merged
  version.

Change-Id: Icc6ccd705db461d570fc929922a830aa6deaca48
2010-02-16 14:32:08 -08:00
Dan Egnor
4f71b8f449 cleanstep due to removal of classes & packages associated
with the old bundled GoogleCheckin.apk
2010-02-13 12:39:55 -08:00
Jeff Hamilton
8b716c09c4 Cleanspec for my earlier change.
Change-Id: I2259095772768ecfcbf38c65df90cb72c3425e7f
2010-02-12 22:39:34 -06:00
Dima Zavin
1181898e54 core: pass nand page size to mkyaffs2image based on BOARD_NAND_PAGE_SIZE boardconfig var
Change-Id: I6feefba15eb1562161e38df03223cb2fba4eb7ee
Signed-off-by: Dima Zavin <dima@android.com>
2010-02-12 15:31:36 -08:00
Doug Zongker
42265390d9 change incremental OTA file install order
(Cherry-pick from donut.)

Delete the old recovery-from-boot patch before patching system files,
then install the new one at the end of the process.  Also fix an issue
with applypatch returning the wrong status.

Change-Id: I614fce39f307eded696ba792912b863f9fb0580b
2010-02-12 12:20:49 -08:00
Ying Wang
e3265fb743 Makefile change for build against historical sdk versions.
If LOCAL_SDK_VERSION is current, link against the stub, otherwise
link against prebuilt historical sdk
2010-02-11 14:23:23 -08:00