Commit Graph

18402 Commits

Author SHA1 Message Date
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
Doug Zongker
6c5a1ceed9 am 95137c3d: am 6c4a70c6: Merge change I672b05c4 into eclair-mr2
Merge commit '95137c3dfeebbefebacd37f26d5e7cb7f0a99c7e'

* commit '95137c3dfeebbefebacd37f26d5e7cb7f0a99c7e':
  make build depend on event-log-tags file
2009-12-04 10:43:36 -08:00
Dianne Hackborn
fef125ec59 am af5cb904: am 176c758c: Change version to MR2 development.
Merge commit 'af5cb9042497509fb75060667f5ca921c10218a6'

* commit 'af5cb9042497509fb75060667f5ca921c10218a6':
  Change version to MR2 development.
2009-12-04 10:41:00 -08:00
Doug Zongker
95137c3dfe am 6c4a70c6: Merge change I672b05c4 into eclair-mr2
Merge commit '6c4a70c64d45545814ba60ad8ad3a95474ea0944' into eclair-mr2-plus-aosp

* commit '6c4a70c64d45545814ba60ad8ad3a95474ea0944':
  make build depend on event-log-tags file
2009-12-04 10:40:39 -08:00
Dianne Hackborn
af5cb90424 am 176c758c: Change version to MR2 development.
Merge commit '176c758cb40afd39960eb6b5fe0a3aabbdc4f8cc' into eclair-mr2-plus-aosp

* commit '176c758cb40afd39960eb6b5fe0a3aabbdc4f8cc':
  Change version to MR2 development.
2009-12-04 10:37:09 -08:00
Android (Google) Code Review
6c4a70c64d Merge change I672b05c4 into eclair-mr2
* changes:
  make build depend on event-log-tags file
2009-12-04 10:36:31 -08:00
Doug Zongker
672b05c47c make build depend on event-log-tags file
Oops, I forgot to make the build actually require the event-log-tags file.
2009-12-04 10:05:20 -08:00
Doug Zongker
0d5eb0b7e4 am af830d39: am 485847e4: Merge change I6f85805b into eclair-mr2
Merge commit 'af830d3999ac1670b92207f6c1201d297913b9a9'

* commit 'af830d3999ac1670b92207f6c1201d297913b9a9':
  break up event-log-tags; generate java source files with constants
2009-12-04 04:31:16 -08:00
Dianne Hackborn
176c758cb4 Change version to MR2 development. 2009-12-03 18:19:53 -08:00
Doug Zongker
af830d3999 am 485847e4: Merge change I6f85805b into eclair-mr2
Merge commit '485847e4c47e1504ddf8b830d557211d02a76e57' into eclair-mr2-plus-aosp

* commit '485847e4c47e1504ddf8b830d557211d02a76e57':
  break up event-log-tags; generate java source files with constants
2009-12-03 17:05:52 -08:00
Doug Zongker
9bd4962af8 break up event-log-tags; generate java source files with constants
Construct the /system/etc/event-log-tags file by unioning together any
*.logtags files included in LOCAL_SRC_FILES throughout the system (with
appropriate error checking for dup tag numbers, etc.)

For java packages, generate a java source file from the logtags file for
that package that contains static integer constants for each tag name.
2009-12-03 16:47:52 -08:00
Dan Bornstein
679aa653fc am 92a71f46: am aa71af7f: am bb0c8804: Add Bluetooth to the test list.
Merge commit '92a71f465fa02de5a5e6ed9ba84d2f1dd62e2c78'

* commit '92a71f465fa02de5a5e6ed9ba84d2f1dd62e2c78':
  Add Bluetooth to the test list.
2009-11-20 16:12:06 -08:00
Dan Bornstein
92a71f465f am aa71af7f: am bb0c8804: Add Bluetooth to the test list.
Merge commit 'aa71af7f8efa812b65461e4d3ca39aae1dd23b8b' into eclair-mr2-plus-aosp

* commit 'aa71af7f8efa812b65461e4d3ca39aae1dd23b8b':
  Add Bluetooth to the test list.
2009-11-20 16:07:29 -08:00
Dan Bornstein
fced1d6d97 am bb0c8804: Add Bluetooth to the test list.
Merge commit 'bb0c8804dd7440d589ef8845960ad8b76d4b6617' into eclair-plus-aosp

* commit 'bb0c8804dd7440d589ef8845960ad8b76d4b6617':
  Add Bluetooth to the test list.
2009-11-20 16:03:32 -08:00
Dan Bornstein
aa71af7f8e am bb0c8804: Add Bluetooth to the test list.
Merge commit 'bb0c8804dd7440d589ef8845960ad8b76d4b6617' into eclair-mr2

* commit 'bb0c8804dd7440d589ef8845960ad8b76d4b6617':
  Add Bluetooth to the test list.
2009-11-20 16:03:22 -08:00
Dan Bornstein
bb0c8804dd Add Bluetooth to the test list.
Change-Id: I1e18b76c87a7bba5ef3b4db8ac763bc7d9b6aac6
2009-11-20 13:13:41 -08:00
Dan Bornstein
3f7669520f am 33f188de: am d867551e: am ffbe862d: Merge change I60b2633b into eclair
Merge commit '33f188de6c656d4056b1f98f37c4b8ca63c7d493'

* commit '33f188de6c656d4056b1f98f37c4b8ca63c7d493':
  Add the JNI test to the CTS list.
2009-11-19 17:38:57 -08:00
Dan Bornstein
33f188de6c am d867551e: am ffbe862d: Merge change I60b2633b into eclair
Merge commit 'd867551efea52a7d342b8fd2ed08fc9939090e88' into eclair-mr2-plus-aosp

* commit 'd867551efea52a7d342b8fd2ed08fc9939090e88':
  Add the JNI test to the CTS list.
2009-11-19 11:48:13 -08:00