Commit graph

569 commits

Author SHA1 Message Date
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
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
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
Ying Wang
3b2bdf1033 Fix and enable proguard on packages. 2010-02-11 13:41:10 -08:00
Mathias Agopian
769835e0d9 add libsurfaceflinger_client and libcamera_client to the prelinkmap 2010-02-11 13:07:20 -08:00
Patrick Scott
9825256577 Put private includes before system includes.
This change allows modules to insert different include paths before the system
include paths. STLPort uses this to find system include files that have the same
name.
2010-02-08 18:57:03 -05:00
Jeff Hamilton
bb67d21337 Get LOCAL_MANIFEST_PACKAGE_NAME working.
Change-Id: Ieafbf2596252ee3a2fe5d1ad433e8863fbf84601
2010-02-05 23:57:34 -06:00
Brian Carlstrom
f184a0f26d Add support for LOCAL_JAVACFLAGS
The Dalvik core libraries team would like to start making warnings
errors in certain packages by definition LOCAL_JAVACFLAGS. This will
allow easier debuging of warnings in other packages by supplying
"-Xlint:..."  options.
2010-02-05 15:57:07 -08:00
Joe Onorato
899e62a841 Add an inherit-package macro to the build system.
This lets you use the source code from one apk to build a new one
with a new module name, a new android package name and optionally,
a new certificate.

To use this, in a makefile, add this:

$(call inherit-package, \
    packages/apps/Music/Android.mk, \
    Music, \
    MusicFork, \
    my_cert, \
    com.example.music)

You don't need the LOCAL_PATH and CLEAR_VARS stuff.  It will override
only the packages that are defined in the makefile name you give, but
if other modules of other types are defined, you will get an error
saying that it's defined twice.  In that case, you need to move the
duplicate library (for example a .so) out into a different makefile.

A LOCAL_OVERRIDES_PACKAGES entry is automatically created for the
forked app.
2010-02-05 10:16:57 -08:00
Jean-Baptiste Queru
29544b21fb Merge "Look for product configs in device/ in addition to vendor/" 2010-02-05 07:16:34 -08:00
Doug Zongker
14833605d2 add UnmountAll function to OTA script; support radio images w/path
Three unrelated changes:

- change the add-radio-file makefile function to support adding files
  with paths.  (The path part of the pathname is stripped off.)

- add an UnmountAll function to the OTA script generation code, so
  that we can explicitly unmount everything we've mounted (in addition
  to doing it automatically at the end of the script).

- add the updater API version to the info object passed to
  device-specific code.

Change-Id: Ia62b15403c1cc8fce8d9910f291450c8077e49f4
2010-02-03 09:21:22 -08:00
Bjorn Bringert
a89c990e31 Add all-logtags-files-under macro
Change-Id: Icb4c7e1bb2dfa4df71f07cb022c92e95a9115019
2010-02-02 20:44:13 +00:00
Raphael
5993b09194 am ccd0338c: am e749b5a7: Fix windows make: layoutlib_api moved to sdk.git too.
Merge commit 'ccd0338ce637e62c483a727de04236aa05f989aa'

* commit 'ccd0338ce637e62c483a727de04236aa05f989aa':
  Fix windows make: layoutlib_api moved to sdk.git too.
2010-01-28 13:43:39 -08:00
Raphael
ccd0338ce6 am e749b5a7: Fix windows make: layoutlib_api moved to sdk.git too.
Merge commit 'e749b5a71abe9c3659921c50cc4468a1a4f984f5' into eclair-plus-aosp

* commit 'e749b5a71abe9c3659921c50cc4468a1a4f984f5':
  Fix windows make: layoutlib_api moved to sdk.git too.
2010-01-25 14:30:49 -08:00
Raphael
e749b5a71a Fix windows make: layoutlib_api moved to sdk.git too.
Change-Id: Ia030eda4514361b20a5ecb29c997ab625909228c
2010-01-22 18:36:37 -08:00
Jean-Baptiste Queru
8d05416d61 Look for product configs in device/ in addition to vendor/
This will allow to create open-sourceable product configurations.

Change-Id: I4e73347c2095935340bfc8c3737c2adf1ef22a9c
2010-01-22 15:47:57 -08:00
Bjorn Bringert
a7ab17d0a3 Allow multiple directories in LOCAL_RESOURCE_DIR
Before, LOCAL_RESOURCE_DIR got messed up when the build system
tried to find the whole LOCAL_RESOURCE_DIR string in each
overlay directory.

This change splits LOCAL_RESOURCE_DIR before appending it to
the overlay directory paths.

I've verified that this now works:

LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/overlay $(LOCAL_PATH)/res

Change-Id: Iea47f94a14720af0ca4b422aec30acf4acbe13cf
2010-01-14 17:55:30 +00:00
Wei-Ta Chen
09831ec9b2 Merge "Add libjpeg to the prelink map." 2010-01-13 01:29:12 -08:00
Raphael Moll
44f6dde6a5 am acbbba88: am d1b68863: Merge "Add etc1tool to Windows SDK." into eclair
Merge commit 'acbbba88fb2a2e43b63cb83675ea368c47621ca8'

* commit 'acbbba88fb2a2e43b63cb83675ea368c47621ca8':
  Add etc1tool to Windows SDK.
2010-01-12 15:43:22 -08:00
Raphael Moll
acbbba88fb am d1b68863: Merge "Add etc1tool to Windows SDK." into eclair
Merge commit 'd1b68863f5ef252a92adcfb22d3ca48872981a61' into eclair-plus-aosp

* commit 'd1b68863f5ef252a92adcfb22d3ca48872981a61':
  Add etc1tool to Windows SDK.
2010-01-12 15:38:41 -08:00
Raphael
4e7b0e21c5 Add etc1tool to Windows SDK.
SDK BUG 2368918

This depends on Change I83485145 from development.git.

Change-Id: I1b4f5e39bd08c0cfbb656f2857921fb5ad305812
2010-01-12 11:18:02 -08:00
Jean-Baptiste Queru
75127b769e Remove special-handling of the restricted tag.
Nobody is using it any more, and it'd be too easy to
make a build system change that wouldn't properly handle it.

Change-Id: Ia61232ff944c34c46932c1885b2b0ec1b479566b
2010-01-11 09:40:39 -08:00
Jean-Baptiste Queru
6907cfe7de Remove special-case where CLASS=apps ignored TAGS=user
Also add a warning when there's TAG=user on a CLASS=apps module,
as this is not what people normally intend (this should be handled
in core.mk instead).

This used to be a source of confusion, with people using TAGS=user on
APPS and non-APPS modules, and being surprised to see some of those
included but not others.

Change-Id: I56b5618a556abdc6b841bf7a943d77c20fe9a4c5
2010-01-11 09:40:39 -08:00
Jean-Baptiste Queru
a831cbdcfc Warn when using unrecognized/uncommon tags.
Such tags don't do anything, so using them is at
best a no-op, at worst a typo where the author intended
something else.

Change-Id: I1462032f4df3564b06a82685f226a6d5a665a633
2010-01-11 09:40:39 -08:00
Joe Onorato
7b86bfb03e add a warning about using include in product spec files.
currently disabled because there are too many of them.
2010-01-07 11:26:05 -08:00
Wei-Ta Chen
d139dbb818 Add libjpeg to the prelink map.
libjpeg is now built to a shared library,
which enables it be dynamically linked by various packeages/libraries.
2010-01-06 18:42:25 +08:00
Joe Onorato
05c7f61caf Don't do the check build step for apps that link against the SDK.
We already have the apicheck process to make sure that nobody breaks that,
so doing the extra check isn't necessary.
2010-01-05 12:47:14 -08:00
Joe Onorato
bc8abb6fec Tell python not to spam the source tree with .pyc files.
This only has an effect on python 2.6 and above.
2010-01-04 12:57:38 -08:00
Jack Palevich
fcc50ebb4a Add libETC1 to the prelink map.
libETC1 is a library for compressing and
decompressing images in the ETC1 format.

This is a common texture format for OpenGL ES 2.0
GPUs.
2009-12-29 19:04:13 +08:00
Jean-Baptiste Queru
0a3cfdc853 Add all-html-files-under
This allows to run droiddoc on only a specific set of subdirectories
instead of using all subdirectories.

Change-Id: I6b5daa31f6ce6801705a5c87bd05ea0e4e8c5d88
2009-12-18 09:02:13 -08:00
Brett Chabot
a709a1b2a4 am d5cf3a95: am 1e43c510: Add CTS accounts tests to CTS makefile.
Merge commit 'd5cf3a95cce2d9699d2c3f5998d51302f51aa03c'

* commit 'd5cf3a95cce2d9699d2c3f5998d51302f51aa03c':
  Add CTS accounts tests to CTS makefile.
2009-12-17 16:40:56 -08:00
Brett Chabot
d5cf3a95cc am 1e43c510: Add CTS accounts tests to CTS makefile.
Merge commit '1e43c510758439b3195597056121c59b71481254' into eclair-plus-aosp

* commit '1e43c510758439b3195597056121c59b71481254':
  Add CTS accounts tests to CTS makefile.
2009-12-17 16:38:04 -08:00
Brett Chabot
1e43c51075 Add CTS accounts tests to CTS makefile.
Change-Id: If7d87e2deed2036536ad852c382dca0e8bbad87b
2009-12-17 15:14:40 -08:00
Andreas Huber
64b00e3f98 Squashed commit of the following:
commit b03d5f537dee393affddf89663ae6977a5512d98
Author: Andreas Huber <andih@google.com>
Date:   Thu Dec 17 14:00:37 2009 -0800

    Update cleanspec to facilitate incremental building with full stagefright lib.

commit b92560a1989f8b9cb27a8772cec5346d3d90dc84
Author: Andreas Huber <andih@google.com>
Date:   Thu Dec 17 13:31:48 2009 -0800

    Enable building stagefright in all builds, make stagefright the default player.
2009-12-17 14:46:46 -08:00
Jeff Hamilton
aa2885ed34 Switch the platform name from Eclair-MR2 to Froyo. 2009-12-17 15:25:19 -06:00
Doug Zongker
f6a53aa5f2 add "EXTERNAL" as special value of LOCAL_CERTIFICATE
Setting LOCAL_CERTIFICATE to "EXTERNAL" now marks an apk (either a
prebuilt or otherwise) as needing the default test key within the
system, but one that should be signed after the target_files is
produced but before sign_target_files_apks does the rest of the
signing.  (We use this to ship apps on the system that are signed by
third parties, like Facebook.)
2009-12-15 15:06:55 -08:00
Doug Zongker
a660e48ea7 am 4cac8afc: am 714111cb: include pre-signed prebuilt .apks in apkcerts.txt
Merge commit '4cac8afc21a356ce3ca074f12383cf1526d44156'

* commit '4cac8afc21a356ce3ca074f12383cf1526d44156':
  include pre-signed prebuilt .apks in apkcerts.txt
2009-12-14 15:33:14 -08:00
Doug Zongker
4cac8afc21 am 714111cb: include pre-signed prebuilt .apks in apkcerts.txt
Merge commit '714111cbdde0fd5c4f276d4666ddb99cbf0c5008' into eclair-mr2-plus-aosp

* commit '714111cbdde0fd5c4f276d4666ddb99cbf0c5008':
  include pre-signed prebuilt .apks in apkcerts.txt
2009-12-14 15:24:22 -08:00
Doug Zongker
714111cbdd include pre-signed prebuilt .apks in apkcerts.txt 2009-12-14 10:14:46 -08:00
Doug Zongker
3a104c868e am 39ecb46e: am 9bc88726: Merge change I45302ff0 into eclair-mr2
Merge commit '39ecb46ed1c124e4d3e3ebb594a62b65984483ac'

* commit '39ecb46ed1c124e4d3e3ebb594a62b65984483ac':
  make prebuilt .apks require LOCAL_CERTIFICATE
2009-12-11 15:01:40 -08:00
Doug Zongker
39ecb46ed1 am 9bc88726: Merge change I45302ff0 into eclair-mr2
Merge commit '9bc88726cb24e92007d42c126ec094e687b3905f' into eclair-mr2-plus-aosp

* commit '9bc88726cb24e92007d42c126ec094e687b3905f':
  make prebuilt .apks require LOCAL_CERTIFICATE
2009-12-11 14:54:54 -08:00
Android (Google) Code Review
9bc88726cb Merge change I45302ff0 into eclair-mr2
* changes:
  make prebuilt .apks require LOCAL_CERTIFICATE
2009-12-11 14:50:33 -08:00
Doug Zongker
45302ff00b make prebuilt .apks require LOCAL_CERTIFICATE
Require people who check in new prebuilts to decide what keys they
should be signed with, rather than having a fire drill every time we
go to sign a build and discover new prebuilts.
2009-12-11 13:50:35 -08:00
Ying Wang
27861a988c am baefd248: am 92e2d3e2: am 6ef046c8: Fixes ProGuard options.
Merge commit 'baefd2480f63ad9b3a5ec9764879ae01f2ad9886'

* commit 'baefd2480f63ad9b3a5ec9764879ae01f2ad9886':
  Fixes ProGuard options.
2009-12-10 23:41:26 -08:00
Ying Wang
baefd2480f am 92e2d3e2: am 6ef046c8: Fixes ProGuard options.
Merge commit '92e2d3e206a301a090d90e8c61d85e88fdc35a71' into eclair-mr2-plus-aosp

* commit '92e2d3e206a301a090d90e8c61d85e88fdc35a71':
  Fixes ProGuard options.
2009-12-10 17:52:12 -08:00
Ying Wang
92e2d3e206 am 6ef046c8: Fixes ProGuard options.
Merge commit '6ef046c8932989ca97d1cb39413ef99761315a06' into eclair-mr2

* commit '6ef046c8932989ca97d1cb39413ef99761315a06':
  Fixes ProGuard options.
2009-12-10 17:39:53 -08:00
Ying Wang
92269fdd4f am 6ef046c8: Fixes ProGuard options.
Merge commit '6ef046c8932989ca97d1cb39413ef99761315a06' into eclair-plus-aosp

* commit '6ef046c8932989ca97d1cb39413ef99761315a06':
  Fixes ProGuard options.
2009-12-09 14:59:19 -08:00
Ying Wang
6ef046c893 Fixes ProGuard options.
1. Dedup LOCAL_JAVA_LIBRARIES.
2. Even no resource or asset for a package, we still need to set
package_expected_intermediates_COMMON, which is anyway used by ProGuard.
2009-12-09 14:31:22 -08:00