Commit graph

705 commits

Author SHA1 Message Date
Dan Bornstein
6bffc91c5d Make the host static library build rule know about
LOCAL_WHOLE_STATIC_LIBRARIES.

While I was in the territory, I reordered a few lines to be more
consistent with nearby code/files.

Change-Id: Ie9809f065e32ca748ae4539dd785980ff496c2d2
2009-10-15 16:28:56 -07:00
Jean-Baptiste Queru
3ca0693894 am e93ece70: merge from open-source master
Merge commit 'e93ece70a8d9657d5d08c59db75582d0d057d3bb'

* commit 'e93ece70a8d9657d5d08c59db75582d0d057d3bb':
  Remove temporary vold logic
  added linux-sh.mk to support SuperH architecture
2009-10-14 16:16:46 -07:00
Jean-Baptiste Queru
e93ece70a8 merge from open-source master 2009-10-14 16:02:08 -07:00
Jean-Baptiste Queru
2a11836482 merge from open-source master 2009-10-14 08:18:24 -07:00
Doug Zongker
690804c399 am 6ebf4436: Merge change I04432db5 into eclair-mr2
Merge commit '6ebf443631025b132f644bd349258192db4e3e9c'

* commit '6ebf443631025b132f644bd349258192db4e3e9c':
  use aapt to build jar files instead of the system zip
2009-10-13 17:10:34 -07:00
Raphael
b54523bc00 am feec1ce3: am aa569862: Windows SDK: support tools/sdklauncher and tools/layoutopt
Merge commit 'feec1ce3e01c93f43f425747df8073e9580d775a'

* commit 'feec1ce3e01c93f43f425747df8073e9580d775a':
  Windows SDK: support tools/sdklauncher and tools/layoutopt
2009-10-13 17:09:19 -07:00
Dan Bornstein
fa477ba15e Allow WITH_JIT to be overridden in a custom buildspec.mk file.
Change-Id: I0fb7ffcfb9786f611e981d8f22f67a5ac8c9c405
2009-10-13 15:56:48 -07:00
Android (Google) Code Review
6ebf443631 Merge change I04432db5 into eclair-mr2
* changes:
  use aapt to build jar files instead of the system zip
2009-10-13 17:12:59 -04:00
Raphael
feec1ce3e0 am aa569862: Windows SDK: support tools/sdklauncher and tools/layoutopt
Merge commit 'aa569862dee45bfa72d342e9982cb5205df9bf04' into eclair-mr2

* commit 'aa569862dee45bfa72d342e9982cb5205df9bf04':
  Windows SDK: support tools/sdklauncher and tools/layoutopt
2009-10-13 12:17:40 -07:00
Dianne Hackborn
3d967b873a am 3f7405e9: am ff6f3fe4: Finish issue #2168428: STOP SHIP: Bump API version to 5.
Merge commit '3f7405e9940db18fade6fb86899bb8b88bd67bcf'

* commit '3f7405e9940db18fade6fb86899bb8b88bd67bcf':
  Finish issue #2168428: STOP SHIP: Bump API version to 5.
2009-10-13 12:12:03 -07:00
Raphael
aa569862de Windows SDK: support tools/sdklauncher and tools/layoutopt
Change-Id: Iac7d7a0cdc439b2bb1e334e82fe0f354b14d7001
2009-10-12 16:16:02 -07:00
Sriram Raman
ca02204ddb am 2bd9027d: Merge change I5bbd2294 into eclair-mr2
Merge commit '2bd9027d0a2055e56a8047c11dda7f6551b9f183'

* commit '2bd9027d0a2055e56a8047c11dda7f6551b9f183':
  For Ying Wang:
2009-10-12 12:42:05 -07:00
Joe Onorato
a5ed6af74d am cb9102e0: am 0889661c: eng builds only -- make the thing that makes setupwizard optional actually work.
Merge commit 'cb9102e056e8553745c2abd942852232bfadd98b'

* commit 'cb9102e056e8553745c2abd942852232bfadd98b':
  eng builds only -- make the thing that makes setupwizard optional actually work.
2009-10-12 12:30:57 -07:00
Dianne Hackborn
c2289d10cc am de7e9e6e: am 0187d842: Part of issue #2168428: STOP SHIP: Bump API version to 5
Merge commit 'de7e9e6e8fc4044dbc48f1687af92e7aae1d6638'

* commit 'de7e9e6e8fc4044dbc48f1687af92e7aae1d6638':
  Part of issue #2168428: STOP SHIP: Bump API version to 5
2009-10-12 12:26:59 -07:00
Brett Chabot
392bda6e09 am 66e0c458: Merge change I7bc67c51 into eclair-mr2
Merge commit '66e0c458ae94b8520d8d54c15ecf6a283380b69d'

* commit '66e0c458ae94b8520d8d54c15ecf6a283380b69d':
  Manual merge of donut-gms cts.mk changes.
2009-10-12 11:41:46 -07:00
Doug Zongker
9e4374be2c use aapt to build jar files instead of the system zip
By using 'aapt add' instead of whatever 'zip' utility happens to be
installed on the machine, we get files that are imgdiff-friendly,
which makes for smaller incremental OTAs.
2009-10-09 12:14:03 -07:00
Dianne Hackborn
3f7405e994 am ff6f3fe4: Finish issue #2168428: STOP SHIP: Bump API version to 5.
Merge commit 'ff6f3fe4482bcad900bce2e78204ad5cb466bbf9' into eclair-mr2

* commit 'ff6f3fe4482bcad900bce2e78204ad5cb466bbf9':
  Finish issue #2168428: STOP SHIP: Bump API version to 5.
2009-10-08 21:07:12 -07:00
Dianne Hackborn
ff6f3fe448 Finish issue #2168428: STOP SHIP: Bump API version to 5.
We are now 2.0.  Note that CorpCal and PhoneConfig are now gone
until their prebuilts are updated.

Change-Id: I26d13d6b75f5633113d82b8d90788d8bbc915014
2009-10-08 20:50:27 -07:00
Brett Chabot
1b3886b848 am 45dc54f6: Add speech tests to CTS makefile.
Merge commit '45dc54f680faea12519870db356f84924c00687d' into eclair

* commit '45dc54f680faea12519870db356f84924c00687d':
  Add speech tests to CTS makefile.
2009-10-08 10:48:24 -07:00
Brett Chabot
af6ccb69fe am 30e1f2bd: Add dpi tests to CTS.
Merge commit '30e1f2bdd83ad7b0f2cb8ec738e93ea2a5a6c408' into eclair

* commit '30e1f2bdd83ad7b0f2cb8ec738e93ea2a5a6c408':
  Add dpi tests to CTS.
2009-10-08 10:48:20 -07:00
Brett Chabot
45dc54f680 Add speech tests to CTS makefile. 2009-10-08 10:00:37 -07:00
Brett Chabot
30e1f2bdd8 Add dpi tests to CTS. 2009-10-08 10:00:37 -07:00
Sriram Raman
5bbd2294e9 For Ying Wang:
Fix "argument list too long" build error bug.
2009-10-07 16:27:38 -07:00
Joe Onorato
cb9102e056 am 0889661c: eng builds only -- make the thing that makes setupwizard optional actually work.
Merge commit '0889661cd890e49a4827da0dc5d583274347d178' into eclair-mr2

* commit '0889661cd890e49a4827da0dc5d583274347d178':
  eng builds only -- make the thing that makes setupwizard optional actually work.
2009-10-07 11:37:52 -07:00
Joe Onorato
0889661cd8 eng builds only -- make the thing that makes setupwizard optional actually work. 2009-10-07 10:01:13 -07:00
Dianne Hackborn
de7e9e6e8f am 0187d842: Part of issue #2168428: STOP SHIP: Bump API version to 5
Merge commit '0187d84264fb6cf67650354c8c5da0a0712dbb0b' into eclair-mr2

* commit '0187d84264fb6cf67650354c8c5da0a0712dbb0b':
  Part of issue #2168428: STOP SHIP: Bump API version to 5
2009-10-06 19:22:41 -07:00
Dianne Hackborn
0187d84264 Part of issue #2168428: STOP SHIP: Bump API version to 5
This bumps the API version.  We are still going to be an Eclair
development version until prebuilts are updated.

Change-Id: Ie76f3cda15b6c2c0b924db614e8024c04ce5a035
2009-10-06 17:22:49 -07:00
Jean-Baptiste Queru
03b09fd33f Remove temporary vold logic 2009-10-02 15:06:40 -07:00
Brett Chabot
7bc67c5114 Manual merge of donut-gms cts.mk changes. 2009-10-02 11:09:41 -07:00
android-build SharedAccount
16d088ec1e set BUILD_ID, do not merge 2009-10-02 08:01:02 -07:00
Doug Zongker
5eec9dd20f am da2d06bb: am c18736b1: remember device-specific releasetools extensions in target-files
Merge commit 'da2d06bb1cf18762257b4f38f698f6d27d6c4412'

* commit 'da2d06bb1cf18762257b4f38f698f6d27d6c4412':
  remember device-specific releasetools extensions in target-files
2009-10-01 12:10:52 -07:00
Doug Zongker
c18736b1a7 remember device-specific releasetools extensions in target-files
Store the location of the releasetools extensions in the target-files
zip, and make ota_from_target_files use that stored location by
default (though it can still be overridden with -s if desired).
2009-09-30 09:20:32 -07:00
Joe Onorato
dea0b8c5ea am 4ff55ba0: am e62902c9: Fix http://b/2114936 - Setting LOCAL_SDK_VERSION current still allows internal API references
Merge commit '4ff55ba0c7749abb0039fa49024be5f1b0e62de2'

* commit '4ff55ba0c7749abb0039fa49024be5f1b0e62de2':
  Fix http://b/2114936 - Setting LOCAL_SDK_VERSION current still allows internal API references
2009-09-25 11:04:55 -07:00
Dave Bort
0a71aacfff am 9db1fc2b: am b392641d: Make fail if it\'s called after including
Merge commit '9db1fc2bea0b75b59ad52f94faa1e7d66209d2d2'

* commit '9db1fc2bea0b75b59ad52f94faa1e7d66209d2d2':
  Make $(my-dir) fail if it's called after including $(CLEAR_VARS)
2009-09-25 10:51:31 -07:00
Android (Google) Code Review
8392b83176 Merge change 25632 into eclair
* changes:
  Set default build ID to eclair (usually this is overridden).  Please do not merge.
2009-09-24 20:20:48 -04:00
Joe Onorato
e62902c95b Fix http://b/2114936 - Setting LOCAL_SDK_VERSION current still allows internal API references 2009-09-24 09:27:35 -07:00
Dave Bort
b392641d9b Make $(my-dir) fail if it's called after including $(CLEAR_VARS) 2009-09-23 12:58:20 -07:00
Jing Yu
2dcc806af5 Add FDO options to Android make system. 2009-09-21 16:31:50 -07:00
Ed Heyl
928aec7cb3 Set default build ID to eclair (usually this is overridden). Please do not merge. 2009-09-17 16:28:37 -07:00
Android Code Review
9a6b73c0aa Merge change 10642
* changes:
  added linux-sh.mk to support SuperH architecture
2009-09-17 14:52:55 -07:00
Doug Zongker
aa7e606fc3 am fe0602f6: increase reserved blocks from 5 to 8
Merge commit 'fe0602f60b971c3b350d47115cba188cc67c7038'

* commit 'fe0602f60b971c3b350d47115cba188cc67c7038':
  increase reserved blocks from 5 to 8
2009-09-17 06:38:40 -07:00
Doug Zongker
fe0602f60b increase reserved blocks from 5 to 8
Our yaffs filesystems reserve 5 blocks, use 1 for a checkpoint, and
may use 1 or 2 more for caching.  Take these all into account when
computing the max image size.
2009-09-14 18:08:45 -07:00
Doug Zongker
93d9ff44ce increase reserved blocks from 5 to 8
Our yaffs filesystems reserve 5 blocks, use 1 for a checkpoint, and
may use 1 or 2 more for caching.  Take these all into account when
computing the max image size.
2009-09-14 17:46:41 -07:00
Andy McFadden
cae7d6735e am 42fe578d: am 2c86bfd2: Sleazy workaround for webkit build failures.
Merge commit '42fe578dae8d8068bef81f2e8cef4d2c38dddfbf'

* commit '42fe578dae8d8068bef81f2e8cef4d2c38dddfbf':
  Sleazy workaround for webkit build failures.
2009-09-10 10:55:03 -07:00
Andy McFadden
2c86bfd285 Sleazy workaround for webkit build failures.
The WebKit library link line is exceeding 128KB on sim-eng builds.
The path to sim-eng object files is slightly longer than device builds
because the object files live under the "host" directory.

This change truncates the "product" directory name to "pr", reducing the
command line by a few KB.  This only affects sim-eng builds.

The real fix will need be to webkit (see internal bug 1917987), which
will eventually start failing on device builds if it continues to grow.
2009-09-10 10:05:14 -07:00
Ben Cheng
db95cb4426 Enable Dalvik JIT by default for the master branch. 2009-09-09 13:03:44 -07:00
Jean-Baptiste Queru
dc785843c7 merge from donut 2009-09-03 14:12:45 -07:00
Android (Google) Code Review
db7ab295c4 Merge change 23258 into eclair
* changes:
  Add the ability to turn on proguard for java targets, and to call aapt to generate a rules file for proguard for stuff from the manifest and other resources that need to be kept.
2009-08-30 13:44:22 -07:00
Joe Onorato
2daa2b3b05 Add the ability to turn on proguard for java targets, and to call aapt
to generate a rules file for proguard for stuff from the manifest and
other resources that need to be kept.
2009-08-30 13:43:00 -07:00
Brett Chabot
0425394081 am 3c7c8a60: Merge change 22522 into donut
Merge commit '3c7c8a60860f97ac4c7381bd6ed30a43864372da' into eclair

* commit '3c7c8a60860f97ac4c7381bd6ed30a43864372da':
  Add Gesture tests to CTS.
2009-08-29 16:44:39 -07:00
Android (Google) Code Review
3c7c8a6086 Merge change 22522 into donut
* changes:
  Add Gesture tests to CTS.
2009-08-29 16:42:25 -07:00
Daniel Sandler
c6646c9ac4 Introduce a default density ('mdpi') for all device builds.
This is done by appending "mdpi" (medium density or 160 dpi, which is what
we've been using so far on dream etc.) to PRODUCT_LOCALES if no other dpi is
found there. (PRODUCT_LOCALES is then sent as a configuration parameter to
aapt to determine which resources should be included in the build.)

With this change, each build will now include only one density of any given
asset. For example, if there exists

  drawable-hdpi/foo.png
  drawable-mdpi/foo.png

...then the build will include *only* drawable-mdpi/foo.png, unless the
density is overridden in the build's own device spec:

  PRODUCT_LOCALES += hdpi

...in which case the build will include only drawable-hdpi/foo.png.
2009-08-28 10:00:12 -04:00
Doug Zongker
3938ab2572 am 1b6d0a65: allow prebuilts to specify LOCAL_CERTIFICATE so they can be resigned
Merge commit '1b6d0a65fc62901f2c18d00c556bd5da50f35584' into eclair

* commit '1b6d0a65fc62901f2c18d00c556bd5da50f35584':
  allow prebuilts to specify LOCAL_CERTIFICATE so they can be resigned
2009-08-26 23:22:05 -07:00
Doug Zongker
1b6d0a65fc allow prebuilts to specify LOCAL_CERTIFICATE so they can be resigned
If a prebuilt specifies a LOCAL_CERTIFICATE, stick it in the
PACKAGES.* collection so that the predexopt process can work on the
file (which only works if the new .apk can be signed).
2009-08-26 18:22:43 -07:00
Doug Zongker
fbc039e9b9 am 4ac1ba61: fix typo in bash expression
Merge commit '4ac1ba61075190fa9ced594c85285beff6293184' into eclair

* commit '4ac1ba61075190fa9ced594c85285beff6293184':
  fix typo in bash expression
2009-08-26 11:41:13 -07:00
Doug Zongker
ed96e88850 resolved conflicts for merge of 6dd2ae02 to eclair 2009-08-26 09:37:07 -07:00
Doug Zongker
4ac1ba6107 fix typo in bash expression
Fortunately the error doesn't change the value of the expression
(since undefined variables are treated as 0 inside "$((...))").
2009-08-25 20:38:50 -07:00
Doug Zongker
6dd2ae02c1 turn down allowed image size
yaffs appears to reserve 5 blocks on the partition for itself.
Account for this when computing the maximum allowable image size.
2009-08-25 18:05:02 -07:00
Brett Chabot
759901fa6d Add Gesture tests to CTS. 2009-08-24 17:30:41 -07:00
Phil Dubach
d0088f0e28 am 793817ba: CTS: Add missing make dependencies for application security tests
Merge commit '793817baa1455c410311d79ef6f44cac1c26be9f' into eclair

* commit '793817baa1455c410311d79ef6f44cac1c26be9f':
  CTS: Add missing make dependencies for application security tests
2009-08-24 15:51:51 -07:00
Phil Dubach
793817baa1 CTS: Add missing make dependencies for application security tests
Change-Id: I4d069b18b0da5f49ca9bb377d04732b8222ac137
2009-08-24 15:18:35 -07:00
Phil Dubach
c4d5369c22 am 3b7521b5: CTS: Add application security tests to makefile
Merge commit '3b7521b524de694cb9da277fd1d7493fc41aa0f3' into eclair

* commit '3b7521b524de694cb9da277fd1d7493fc41aa0f3':
  CTS: Add application security tests to makefile
2009-08-24 13:39:32 -07:00
Phil Dubach
3b7521b524 CTS: Add application security tests to makefile
Change-Id: I51291d338cca88fed68247efbecbaf747306c6b7
2009-08-24 11:49:39 -07:00
Kenny Root
23f70ffd9d Update prelink map for libFLAC 2009-08-24 11:35:02 -07:00
Scott Su
40ea53098c Remove frameworks/base/im from build path 2009-08-23 23:43:24 -07:00
Phil Dubach
dd6c1e11c5 am 7c463e4b: Merge change 21778 into donut
Merge commit '7c463e4b0565f752bc06feb98962ab1536937aa1' into eclair

* commit '7c463e4b0565f752bc06feb98962ab1536937aa1':
  CTS: Enable Python description/plan generator
2009-08-22 07:43:37 -07:00
Phil Dubach
5e3ab04d97 CTS: Enable Python description/plan generator
This enables the new description/plan generator added in change
21366.
2009-08-19 17:03:21 -07:00
Android (Google) Code Review
a3f7c20f90 Merge change 21912 into eclair
* changes:
  Bump platform version to 4.
2009-08-19 14:46:27 -07:00
Raphael
28fcfdd7dd Fix broken server Windows SDK build.
I removed these lines because for some reason building under Windows
fails for me when they are present. However the build server breaks
so I'll rolling them back and I'll try to understand that later.
2009-08-19 14:06:33 -07:00
Raphael
f6ff4c5acf Windows: Fix platform build. 2009-08-19 11:32:15 -07:00
Dianne Hackborn
e34fdc0113 Bump platform version to 4.
Not sure why this didn't get integrated from Donut.
2009-08-19 11:00:21 -07:00
Android (Google) Code Review
9af298ec82 Merge change 21127
* changes:
  Remove 'ctor-dtor-privacy' warning, as it's not very usefull.
2009-08-13 12:03:57 -07:00
Marco Nelissen
7f0a18f771 Remove 'ctor-dtor-privacy' warning, as it's not very usefull. 2009-08-13 11:13:21 -07:00
Sriram Raman
fab87998b5 Fix the platform version (1.6 now) and sdk version (4) 2009-08-12 16:02:12 -07:00
Android (Google) Code Review
5b5f82b635 Merge change 21000 into donut
* changes:
  Update the platform-version-codename
2009-08-12 15:47:22 -07:00
Sriram Raman
20572dd352 Update the platform-version-codename 2009-08-12 15:22:34 -07:00
Dianne Hackborn
a37bdef67a am 6929fb57: Merge change 20880 into donut
Merge commit '6929fb57a5afb90606feb8c35c8c2cda170adfe4'

* commit '6929fb57a5afb90606feb8c35c8c2cda170adfe4':
  Fix issue #2048267: Run zipalign on all prebuilts
2009-08-12 12:05:27 -07:00
Raphael
cac4dccb0a am 31a8ac22: BUG 1993354 : Add zipalign to Windows SDK
Merge commit '31a8ac22585b2a8263892487bd38b64783402e06'

* commit '31a8ac22585b2a8263892487bd38b64783402e06':
  BUG 1993354 : Add zipalign to Windows SDK
2009-08-12 12:04:53 -07:00
Android (Google) Code Review
6929fb57a5 Merge change 20880 into donut
* changes:
  Fix issue #2048267: Run zipalign on all prebuilts
2009-08-11 19:56:57 -07:00
Dianne Hackborn
9c0c4b7a58 Fix issue #2048267: Run zipalign on all prebuilts 2009-08-11 19:41:51 -07:00
Phil Dubach
378a5884da am c539dbe6: CTS: Add missing integration of 147397 to fix VM tests
Merge commit 'c539dbe6a2810818ac22f180e64bdc0256557532'

* commit 'c539dbe6a2810818ac22f180e64bdc0256557532':
  CTS: Add missing integration of 147397 to fix VM tests
2009-08-11 18:11:22 -07:00
Raphael
31a8ac2258 BUG 1993354 : Add zipalign to Windows SDK 2009-08-11 15:36:16 -07:00
Phil Dubach
c539dbe6a2 CTS: Add missing integration of 147397 to fix VM tests
For host side test packages, the name of the jar file containing the tests is
declared in the packages Android.mk.  The name of the make file needs to be
passed to the description generator so that it can pick up this information.
The makefile was not passing on the parameter containing the make file name.
2009-08-10 14:23:23 -07:00
Doug Zongker
8510a1e0d7 use *_PARTITION_SIZE instead of *_MAX_SIZE
Make BoardConfig.mk store the size of the partition rather than the
maximum size of the image that can be flashed there, because the
function used to do the conversion isn't available when BoardConfig.mk
is read any more.
2009-08-10 09:03:16 -07:00
Joe Onorato
3366c07e56 Tweak the product graph formatting. 2009-08-08 12:15:10 -07:00
Brian Swetland
630b7d3ffa build: do not attempt to build recovery.img for TINY_ANDROID builds
Signed-off-by: Brian Swetland <swetland@google.com>
2009-08-07 18:09:44 -07:00
Doug Zongker
edd731f430 am f7c8b9ad: reenable ranlib transform for prebuilts
Merge commit 'f7c8b9adb4b65fafac786e77f6dd7c3411344dba'

* commit 'f7c8b9adb4b65fafac786e77f6dd7c3411344dba':
  reenable ranlib transform for prebuilts
2009-08-07 09:15:21 -07:00
Doug Zongker
f7c8b9adb4 reenable ranlib transform for prebuilts
An extra blank line detached the ranlib commands from the rules they
were supposed to be for.
2009-08-07 08:45:49 -07:00
Doug Zongker
85416153ae am d0a44722: add LOCAL_PREBUILT_STRIP_COMMENTS to clear_vars.mk
Merge commit 'd0a44722be82319e45b6616267011d4dd17e767b'

* commit 'd0a44722be82319e45b6616267011d4dd17e767b':
  add LOCAL_PREBUILT_STRIP_COMMENTS to clear_vars.mk
2009-08-06 21:56:50 -07:00
Doug Zongker
d0a44722be add LOCAL_PREBUILT_STRIP_COMMENTS to clear_vars.mk 2009-08-06 21:52:47 -07:00
Android (Google) Code Review
80f820ca1a am 01bf5684: Merge change 20313 into donut
Merge commit '01bf5684b448623d7eb054b6d717bb77af05de33'

* commit '01bf5684b448623d7eb054b6d717bb77af05de33':
  add feature to strip "# comment" lines from prebuilt files
2009-08-06 16:35:50 -07:00
Android (Google) Code Review
e9024b3ee1 Merge change 20172
* changes:
  Add back a few libraries for backward-compability with the donut skia
2009-08-06 14:52:39 -07:00
Doug Zongker
1046d20624 add feature to strip "# comment" lines from prebuilt files
Change things so that when $(LOCAL_PREBUILT_STRIP_COMMENTS) is
nonempty, we copy the source file using sed to strip out all the "#
line"-style comments and blank lines, saving considerable system image
space in the case of some wifi configurations.

Bug: 2036961
2009-08-06 14:39:43 -07:00
Joe Onorato
dc1a728fb8 Rewrite findleaves.sh in python
This cuts the make startup time by about 30 seconds.  Python is faster
than bash in this case, and also we can now supply multiple directories
to prune, and skip the .repo directory, which is, uh, big.

This is from my mac laptop:

$ time build/tools/findleaves.sh --prune="./out" . Android.mk > /dev/null

real    0m29.186s
user    0m0.550s
sys 0m5.897s

$ time build/tools/findleaves.py --prune="./out" . Android.mk > /dev/null

real    0m4.701s
user    0m0.645s
sys 0m1.294s

$ time build/tools/findleaves.py --prune="./out" --prune="./.repo" . Android.mk > /dev/null
real    0m0.176s
user    0m0.094s
sys 0m0.080s
2009-08-06 12:09:21 -07:00
Jean-Baptiste Queru
0082bbfb7d Add back a few libraries for backward-compability with the donut skia 2009-08-05 15:17:42 -07:00
Jean-Baptiste Queru
fe77558c21 Add libacc.so to prelink map for forward-compatibility 2009-08-05 13:15:17 -07:00
Jean-Baptiste Queru
123f82cb0b merge from donut 2009-08-03 07:50:30 -07:00
Joe Onorato
1de66889ec Don't check build tools versions (including javac) every time make is run.
This trims off another 1/3 of a second from incremental build times.
VERSION_CHECK_SEQUENCE_NUMBER can be incremented to force a check.
2009-07-30 11:54:27 -07:00
Joe Onorato
ead9646f1f Don't run findleaves.sh if we're doing ONE_SHOT_MAKEFILE.
This cuts the minimum mmm time from 17 seconds to 5 seconds on my mac pro.
2009-07-30 11:20:04 -07:00
Phil Dubach
e7faad965f am 951f3d89: CTS: Add telephony and webkit test cases to CTS makefile
Merge commit '951f3d89fb8c61264a20f9e44b7882e6f562e1d3'

* commit '951f3d89fb8c61264a20f9e44b7882e6f562e1d3':
  CTS: Add telephony and webkit test cases to CTS makefile
2009-07-30 06:56:47 -07:00
Android (Google) Code Review
a86afb626f am c16c0a41: Merge change 8942 into donut
Merge commit 'c16c0a41f58458b21a4ee5f34a2bcdaa46d156af'

* commit 'c16c0a41f58458b21a4ee5f34a2bcdaa46d156af':
  Add CTS permission2 test package to cts.
2009-07-29 16:44:58 -07:00
Jean-Baptiste Queru
7227ea7619 merge from donut 2009-07-29 14:56:48 -07:00
Phil Dubach
951f3d89fb CTS: Add telephony and webkit test cases to CTS makefile 2009-07-29 11:58:11 -07:00
Brett Chabot
7b5edc3e8a Add CTS permission2 test package to cts. 2009-07-28 20:11:24 -07:00
Joe Onorato
cffab81686 Make the product graph slightly more readable. 2009-07-28 18:29:19 -07:00
Jean-Baptiste Queru
7c07cf9a82 Merge korg/donut into korg/master
Conflicts:

	core/apicheck_msg_current.txt
	core/combo/linux-arm.mk
	core/prelink-linux-arm.map
	tools/droiddoc/src/ClassInfo.java
2009-07-25 16:58:22 -07:00
Android (Google) Code Review
4387b34839 Merge change 8494
* changes:
  Fix issue 2001204: libaudiopolicy.so and libaudiopolicygeneric.so libraries must be pre-linked.
2009-07-25 00:54:27 -07:00
Sriram Raman
7b02ff0fdc am 1e96ac84: Make the recovery.img construction (from boot.img) logic depend on whether recovery.img was installed. Don\'t have to re-specify exclusion list for the patch file construction.
Merge commit '1e96ac8430da922332e4c85e7eed0e95442ff2ce'

* commit '1e96ac8430da922332e4c85e7eed0e95442ff2ce':
  Make the recovery.img construction (from boot.img) logic depend on whether recovery.img was installed.
2009-07-24 16:09:20 -07:00
Sriram Raman
1e96ac8430 Make the recovery.img construction (from boot.img) logic depend on whether recovery.img was installed.
Don't have to re-specify exclusion list for the patch file construction.
2009-07-24 14:24:35 -07:00
Android Git Automerger
9c3b0d58c8 Merge commit '66ae61670d3ea69dd1cf72cf529c29654c07405e' 2009-07-24 12:48:15 -07:00
Android Git Automerger
c41bda63a3 Merge commit '3455a3d4a1b5f59ccbcc2ac7268d11b03861c229' 2009-07-24 12:47:48 -07:00
Android Git Automerger
dabee36b79 Merge commit 'b003d89ee3a6d39a0ad3ca6e9c8a61f39ef3b92a' 2009-07-24 12:47:28 -07:00
Android Git Automerger
cb69dabbdd Merge commit '22bc517cdfb6b7ee5f90f61de425516c1d7b0245' 2009-07-24 12:47:17 -07:00
Android Git Automerger
72e108a1d4 Merge commit '7a7cd0d8a3ee6d061d7b505583cb791eec6124f5' 2009-07-24 12:47:03 -07:00
Android Git Automerger
358a48e12a merge 73ef8257ce from donut (resolved conflicts) 2009-07-24 12:46:51 -07:00
Android (Google) Code Review
66ae61670d Merge change 8517 into donut
* changes:
  Fix generic-userdebug build (don't build OTA for this target).
2009-07-24 12:35:21 -07:00
Sriram Raman
b11428e53b Fix generic-userdebug build (don't build OTA for this target). 2009-07-24 12:02:28 -07:00
James Dong
90c23aa130 DO NOT MERGE TO MASTER
remove opencore avc encoder DSO
bug 2001900
2009-07-24 11:50:47 -07:00
Eric Laurent
4cb0ae10ec Fix issue 2001204: libaudiopolicy.so and libaudiopolicygeneric.so libraries must be pre-linked. 2009-07-24 06:56:02 -07:00
Android (Google) Code Review
ef9f4ea0b8 am 4d7c4348: Merge change 8295 into donut
Merge commit '4d7c4348077b0f1a713ebffe59b458a5d95fba11'

* commit '4d7c4348077b0f1a713ebffe59b458a5d95fba11':
  applypatch changes for patching recovery image
2009-07-23 23:58:04 -07:00
Doug Zongker
3455a3d4a1 don't try to build recovery patch in generic build 2009-07-23 20:06:57 -07:00
Doug Zongker
b003d89ee3 make path explicit when running imgdiff
The build servers don't run "lunch" before building, so they don't
have the same path as everyone else.  Explicitly set it when running
imgdiff.
2009-07-23 18:48:38 -07:00
Doug Zongker
22bc517cdf fix imgdiff/bsdiff dependencies
These should be regular dependencies, not order-only ones.
2009-07-23 18:27:43 -07:00
Doug Zongker
7a7cd0d8a3 fix system size calculation for SDK build
The SDK build doesn't have recovery, don't try to generate a patch or
include it in the system image size calculation.  Also there's a
dependency on bsdiff that was omitted.
2009-07-23 17:58:54 -07:00
Android (Google) Code Review
8c0a4655e7 Merge change 8404
* changes:
  add librs and librs_jni to the prelink map.
2009-07-23 15:24:45 -07:00
Jason Sams
511569b76e add librs and librs_jni to the prelink map. 2009-07-23 15:15:13 -07:00
Doug Zongker
73ef8257ce use a binary patch to install recovery from system
Instead of storing the whole recovery image in system in order to
flash it on first boot, we instead use an imgdiff patch from the boot
image to create the recovery image.  This is substantially smaller
since it effectively only stores the recovery binary and UI images
(the kernel and the init binary are identical to that of the boot
image).

This change modifies the OTA-building script to create and install
these patches, and changes the calculation of the system image size in
the Makefile to reflect the new scheme.
2009-07-23 15:12:53 -07:00
Jesse Wilson
cfcbcf2856 Merge commit '289d80ee' into manualmerge2
Conflicts:
	tools/droiddoc/src/DroidDoc.java
	tools/droiddoc/test/stubs/func.sh
2009-07-23 11:10:14 -07:00
Doug Zongker
6c770467fb applypatch changes for patching recovery image
Make some changes needed to applypatch in order to store the recovery
image in the system partition as a binary patch relative to the boot
image:

  - make applypatch use shared libraries, so it's smaller.  It will
    need to be on the main system so it can install the recovery
    image.  Make an applypatch_static binary for use in recovery
    packages (still needed for updating cupcake devices to donut).

  - output the results of patching to an in-memory buffer and write
    that to the partition; there's no convenient /tmp for us to us.
    (This should be basically a no-op in recovery, since /tmp is a
    ramdisk anyway.)
2009-07-22 19:15:59 -07:00
Jesse Wilson
289d80eee4 Adding version information to DroidDoc. Rather than pulling the version from
@since tags in the code, it's pulled from the API XML files also used by
apicheck.

The code now reads the apicheck XML, and applies it's versions to the DroidDoc
class models. The models output the version to HDF, and that's picked up by
the CS templates.

The clearsilver templates will be changed to be pretty in a follow up change.

Conflicts:
	tools/droiddoc/src/DroidDoc.java
2009-07-21 18:09:39 -07:00
Joe Onorato
b7c41aaad0 Add a separate version of the docs build that only does the stubs.
That way we don't have to wait for clearsilver to write the thousands
of html files during every build.

(This is the build change, there is also a frameworks/base change)
2009-07-20 11:57:59 -04:00
Android (Google) Code Review
dce85e32ec am 6ef19dad: Merge change 7040 into donut
Merge commit '6ef19dadbf1f2e35551d2bf559b0d533f77b366d'

* commit '6ef19dadbf1f2e35551d2bf559b0d533f77b366d':
  CTS: Add media test cases to CTS makefile
2009-07-19 20:20:12 -07:00
Android (Google) Code Review
36cb84fcae Merge change 7774
* changes:
  enable cortex branch predition errata workaround for armv7-a builds
2009-07-17 17:18:21 -07:00
Joe Onorato
f2bce89880 am e334d255: Speed up the full build.
Merge commit 'e334d255dc8f85d610f4d0339227a0b985494811'

* commit 'e334d255dc8f85d610f4d0339227a0b985494811':
  Speed up the full build.
2009-07-17 17:13:08 -07:00
Erik Gilling
c12c518379 enable cortex branch predition errata workaround for armv7-a builds
Signed-off-by: Erik Gilling <konkers@android.com>
2009-07-17 15:58:42 -07:00
Android (Google) Code Review
6ef19dadbf Merge change 7040 into donut
* changes:
  CTS: Add media test cases to CTS makefile
2009-07-17 15:56:25 -07:00
Joe Onorato
e334d255dc Speed up the full build.
Now, by default, instead of fully building everything,
we skip dexing the modules that aren't going to be included
in the current build.

This will slow down some of the incremental builds (like tests),
but it improves the regular eng build from 27.5 minutes on my
Mac Pro to 25 minutes.  That's not as much of an improvement
as I had hoped for, but it's still better.

There is also a change in here that puts the java-source-list
file which is used to get around limited command line lengths
in the proper directory.  Before this change, it was an
accident that the directory for that file existed!
2009-07-17 16:48:15 -04:00
Android (Google) Code Review
04418dc32c Merge change 7583
* changes:
  Modify libqcamera to be called liboemcamera
2009-07-16 15:17:45 -07:00
Rebecca Schultz Zavin
a5b5ea9d6d Modify libqcamera to be called liboemcamera
This will allow us to support non qualcomm cameras in the prelink map.

Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
2009-07-16 14:11:57 -07:00
Mike Reed
582dcbd7d1 add HAVE_VFP flag 2009-07-16 15:22:57 -04:00
Phil Dubach
571d0f299f CTS: Add media test cases to CTS makefile 2009-07-15 11:11:13 -07:00
Android (Google) Code Review
1935a3a3f6 Merge change 6928
* changes:
  set -fpu=neon so we can use arm_neon.h
2009-07-14 10:50:13 -07:00
Marco Nelissen
e4aaa368b3 Apparently the build server uses a different compiler, one that doesn't understand '-fdiagnostics-show-option' 2009-07-13 20:57:24 -07:00
Marco Nelissen
bac9a7f18e Enable some more useful warnings, and treat some particularly bad ones (that we don't have currently) as errors. 2009-07-13 17:51:59 -07:00
Mike Reed
8ce877a3ab set -fpu=neon so we can use arm_neon.h 2009-07-13 14:48:43 -04:00
Android (Google) Code Review
06f88f5789 Merge change 6571
* changes:
  Since we're using gcc 4.4 in master, we can use the -Werror= option to make not having a virtual destructor in classes with virtual methods an error. I already fixed all code that had this problem, so now it's a matter of turning the option on. Also, as long as we don't have any C-specific options, it's probably best to copy the CPP flags from the C flags. We can always break them out later.
2009-07-10 16:23:23 -07:00
Mike Reed
a14deb7eaf rename libsgl/libscorecg to libskia 2009-07-10 15:54:32 -04:00
Shin-ichiro KAWASAKI
ff328a9409 added linux-sh.mk to support SuperH architecture 2009-07-09 17:51:25 +09:00
Marco Nelissen
73a075d8b2 Since we're using gcc 4.4 in master, we can use the -Werror= option
to make not having a virtual destructor in classes with virtual
methods an error. I already fixed all code that had this problem,
so now it's a matter of turning the option on.
Also, as long as we don't have any C-specific options, it's
probably best to copy the CPP flags from the C flags. We can
always break them out later.
2009-07-08 17:51:18 -07:00
Android (Google) Code Review
60175aadcd Merge change 6444
* changes:
  Revert "Ensure that /system/etc/vold.conf is created in the "generic" product."
2009-07-08 15:35:05 -07:00
Android (Google) Code Review
c8e545b405 am e41accf6: Merge change 6412 into donut
Merge commit 'e41accf68eedfd17bc569aee8480cf8c48d82e61'

* commit 'e41accf68eedfd17bc569aee8480cf8c48d82e61':
  Pass compiler flags for C++ too, and add a flag that enables warnings about missing virtual destructors
2009-07-08 13:52:21 -07:00
Doug Zongker
b17199ee41 am 742fa575: fix problems with new image size calculations
Merge commit '742fa575d09272f1e06616fc208a1e08830c8f82'

* commit '742fa575d09272f1e06616fc208a1e08830c8f82':
  fix problems with new image size calculations
2009-07-08 13:52:20 -07:00
Android (Google) Code Review
e41accf68e Merge change 6412 into donut
* changes:
  Pass compiler flags for C++ too, and add a flag that enables warnings about missing virtual destructors
2009-07-08 13:01:22 -07:00
Doug Zongker
742fa575d0 fix problems with new image size calculations
The build servers have GNU coreutils 5.93, where stat does not output
a newline.  Ubuntu hardy has GNU coreutils 6.10, where it does.
Lacking a newline messes up the summing of the sizes.  Fix
get-file-size to remove the newline if present, and make the total
calculation in assert-max-file-size more robust.

Also, if the image was too big, it was not actually making the build
fail (because /bin/false was not the last thing called).  Fix that so
it does.
2009-07-08 12:09:04 -07:00
San Mehat
8e879ba1c5 Revert "Ensure that /system/etc/vold.conf is created in the "generic" product."
This reverts commit ff2c9deb79.

This breaks SD cards on the device (always installs the emulator vold.conf)
2009-07-07 20:13:41 -07:00
Doug Zongker
b6d89448a9 am 8cebf1ff: fix mislaid \'if\' in recovery
Merge commit '8cebf1ff7836a5dc365e49f7a14d7546a651d9c7'

* commit '8cebf1ff7836a5dc365e49f7a14d7546a651d9c7':
  fix mislaid 'if' in recovery
2009-07-07 17:19:29 -07:00
Doug Zongker
8cebf1ff78 fix mislaid 'if' in recovery
When I moved the building of the recovery image upwards in the file, I
moved an 'endif' surrounding it but not the matching 'if'.  How did
this ever work?
2009-07-07 17:14:25 -07:00
Doug Zongker
97f696cdaa am 4647f12a: fix image size tests
Merge commit '4647f12a4ff9dc54247184f17ff3de1cc423f213'

* commit '4647f12a4ff9dc54247184f17ff3de1cc423f213':
  fix image size tests
2009-07-07 16:43:16 -07:00
Marco Nelissen
79005e03cc Pass compiler flags for C++ too, and add a flag that enables warnings about missing virtual destructors 2009-07-07 13:59:38 -07:00
Jean-Baptiste Queru
04edc95a32 Merge branch 'master' of git://android.git.kernel.org/platform/build into merge_korg_master
Conflicts:
	core/apicheck_msg_current.txt
2009-07-06 12:27:36 -07:00
Android (Google) Code Review
45ae88c2a2 am 92c8ecbf: Merge change 5929 into donut
Merge commit '92c8ecbf99daf492a24408686017609763429251'

* commit '92c8ecbf99daf492a24408686017609763429251':
  Add the JNI library of CertTool for handling certificates.
2009-07-03 08:58:35 -07:00
Doug Zongker
4647f12a4f fix image size tests
There are currently two errors in the way we test the size of built
images against the size of the partition on the hardware:

- the limits in BoardConfig.mk are set with the data size only, but
  images contain an extra 64 bytes per 2048-byte page.  This means we
  think the partition is about 1/32 smaller than it really is.

- when we deliver a build via OTA, the system partition ends up with
  one more file than when it's flashed via fastboot.  That file is a
  copy of the recovery image.  In order to be able to OTA a build, we
  need to make sure the system partition has enough room for all the
  system files plus the recovery image as well.

For the kila system partition, these errors are roughly the same order
of magnitude -- about 2MB, one in the "safe" direction, one in the
"unsafe" direction.  This change fixes both to give us a more accurate
notion of how close we are to the limit.

Make the build emit a warning (but not fail) when the size is within
32kb of the limit.

Also, include the values of the partition size limits in an info file
in the target-files package, so post-processing tools can use them
without parsing the BoardConfig.mk file.
2009-07-02 12:21:43 -07:00
Chung-yih Wang
c74bbeecd0 Add the JNI library of CertTool for handling certificates. 2009-07-02 00:36:44 +08:00
Android (Google) Code Review
810e4c9d54 am c898974b: Merge change 5553 into donut
Merge commit 'c898974bcc3e6adfc2900c2a01bde5f83a0591d6'

* commit 'c898974bcc3e6adfc2900c2a01bde5f83a0591d6':
  Change cts makefile to bundle junit.jar.
2009-06-30 14:48:52 -07:00
Android (Google) Code Review
c898974bcc Merge change 5553 into donut
* changes:
  Change cts makefile to bundle junit.jar.
2009-06-29 09:16:49 -07:00
Brett Chabot
67bae7fc68 Change cts makefile to bundle junit.jar. 2009-06-27 13:30:38 -07:00
Patrick Scott
f4f85a277e Fix the simulator build by setting TARGET_PRELINK_MODULE before including
BoardConfig.mk
2009-06-25 15:55:17 -04:00
Android (Google) Code Review
3fbb580c10 Merge change 5099
* changes:
  Move the BoardConfig.mk search and inclusion to core/config.mk.
2009-06-24 13:28:46 -07:00
Android (Google) Code Review
31424d6420 Merge change 5082
* changes:
  pass correct -s and -m options to release tools
2009-06-24 13:20:12 -07:00
Android (Google) Code Review
4179f16e48 Merge change 4992
* changes:
  Change to add the 4.4.0 toolchain directory to PATH.
2009-06-23 16:20:02 -07:00
Patrick Scott
87c86573e0 Move the BoardConfig.mk search and inclusion to core/config.mk.
This allows TARGET_ARCH_VARIANT to be set by the vendor before we choose the
architecture in core/combo/select.mk.

Also add a primitive armv7-a.mk for turning on hardware floating point.
2009-06-23 15:28:07 -04:00
Doug Zongker
659fc55e44 pass correct -s and -m options to release tools
When building an OTA package, TARGET_RELEASETOOLS_EXTENSIONS can be
set (in BoardConfig.mk) to specify where the device-specific
releasetools code is located.  (The default location is the common
directory for the device's vendor.)  The TARGET_OTA_SCRIPT_MODE can be
used to override the default script mode ("auto") for a particular
device.
2009-06-23 09:54:52 -07:00
Joe Onorato
6178e239e6 am 9d9f3678: Java 1.5 is required. Enforce it.
Merge commit '9d9f367895655411c42123177ae1c32f104b3c01'

* commit '9d9f367895655411c42123177ae1c32f104b3c01':
  Java 1.5 is required.  Enforce it.
2009-06-22 22:04:15 -07:00
Joe Onorato
9d9f367895 Java 1.5 is required. Enforce it. 2009-06-22 18:15:38 -07:00
Doug Zongker
e01100c7ac generalize the definition of a "radio image"
Non-HTC devices may have multiple files constituting their "radio
image".  Generalize the INSTALLED_RADIOIMAGE_TARGET variable a bit:
initially define it as empty, then let AndroidBoard.mk files add to
it.  Provide a convenience function add-radio-image for them to call
to add files.  Put all those files into the target_files zip for use
in OTA and fastboot package construction.

Note that for HTC devices, this changes the name of the radio image in
the target_files zip:  instead of "RADIO/image" it will be
"RADIO/radio.img".  Tools that use the target_files zip will need to
be changed.
2009-06-22 17:46:19 -07:00
Jing Yu
f28c6fabb6 Change to add the 4.4.0 toolchain directory to PATH.
Since we have switched the default toolchain from 4.2.1 to 4.4.0,
we need to change the paths to add from 4.2.1 to 4.4.0.
2009-06-22 16:03:34 -07:00
Android (Google) Code Review
24254dbd6f am edb6829f: Merge change 4654 into donut
Merge commit 'edb6829f832bb79ba2e96ada74b3b971b73ad9a7'

* commit 'edb6829f832bb79ba2e96ada74b3b971b73ad9a7':
  Put the java source file list files somewhere where they don't
2009-06-18 13:58:02 -07:00
Android (Google) Code Review
edb6829f83 Merge change 4654 into donut
* changes:
  Put the java source file list files somewhere where they don't conflict with the .class files that are getting zipped up, and delete them when we're done with them.
2009-06-18 13:52:57 -07:00
Doug Zongker
ac4920a90b resolved conflicts for merge of c494d7ce to master 2009-06-18 13:42:20 -07:00
Doug Zongker
c494d7cee8 generate OTA packages that use edify
Split the details of generating script syntax into a generator class:
one for amend (whose output should be equivalent to the current
output), and one for edify.

Fix 'otatools' build rule to build imgdiff.
2009-06-18 13:19:07 -07:00
Joe Onorato
483d92412f Put the java source file list files somewhere where they don't
conflict with the .class files that are getting zipped up, and
delete them when we're done with them.
2009-06-18 13:16:52 -07:00
Doug Zongker
d6fb2d40b5 am 602a84e0: fix releasetools for non-linux architectures
Merge commit '602a84e0bbf1807a9403cfa50184241f6fc035c4'

* commit '602a84e0bbf1807a9403cfa50184241f6fc035c4':
  fix releasetools for non-linux architectures
2009-06-18 10:47:13 -07:00
Doug Zongker
602a84e0bb fix releasetools for non-linux architectures
The ota and img building scripts contained some hardcoded 'linux-x86'
paths.  Remove and replace with a slightly redefined -p option.
Modify Makefile to pass correct -p when building.
2009-06-18 10:43:55 -07:00
Android (Google) Code Review
d67bb8630a Merge change 4496
* changes:
  Switch default toolchain to 4.4.0 in master.
2009-06-17 23:34:10 -07:00
Android (Google) Code Review
daadaaa308 am 1a28c1a4: Merge change 4541 into donut
Merge commit '1a28c1a4c1ad0c4adf0c63bb36f47394e9509360'

* commit '1a28c1a4c1ad0c4adf0c63bb36f47394e9509360':
  remember in the target-files package what version of the API recovery uses
2009-06-17 21:49:40 -07:00
Sriram Raman
1bc6248b35 Fix the build name. Previously "DONUT-BURGER"; Now "Donut" 2009-06-17 17:56:33 -07:00
Doug Zongker
b1134dd049 remember in the target-files package what version of the API recovery uses 2009-06-17 17:09:40 -07:00
Jing Yu
b845c2fe20 Switch default toolchain to 4.4.0 in master. 2009-06-17 12:06:23 -07:00
Doug Zongker
38a649f873 handle BOARD_KERNEL_BASE in releasetools
Some devices define a BOARD_KERNEL_BASE argument which must be given
as an argument to mkbootimg when building a bootable image.  Store the
value of this var (if any) in the target-files zip and use it when
building images.
2009-06-17 09:07:09 -07:00
The Android Open Source Project
157064f0b6 manual merge of dddd957c, explicitly list SDK image dependencies
Merge commit 'dddd957c'
2009-06-15 22:21:14 -07:00
Doug Zongker
dddd957c74 explicitly list SDK image dependencies
The SDK build used to have the update package as a dependency, in
order to force various image files to be built.  Now the the update
package can't be built for sdk-eng, list the individual images needed
instead.
2009-06-15 21:25:32 -07:00
The Android Open Source Project
93521c42e4 manual merge of 367910fc, don't build ota or update packages for sdk or sim
Merge commit '367910fc'
2009-06-15 19:29:10 -07:00
Doug Zongker
367910fc6d don't build ota or update packages for sdk or sim 2009-06-15 18:56:51 -07:00
The Android Open Source Project
61ceba259d manual merge of 37c0e274, fix building of otacerts.zip
Merge commit '37c0e274'
2009-06-15 18:12:44 -07:00
Android (Google) Code Review
6be991f074 am cf348b97: Merge change 4232 into donut
Merge commit 'cf348b97bdb52b7ffe7be0d17318b1fda425a211'

* commit 'cf348b97bdb52b7ffe7be0d17318b1fda425a211':
  use releasetools scripts to build update and OTA packages
2009-06-15 17:56:59 -07:00
Doug Zongker
37c0e274d1 fix building of otacerts.zip
Was using a variable which was only defined inside the rule, outside
the rule.  Change to use the correct variable.
2009-06-15 15:36:16 -07:00
Doug Zongker
8678df4c06 use releasetools scripts to build update and OTA packages
Use the python scripts in build/tools/releasetools (that are used to
build signed releases) to build packages within the Makefile as well.
2009-06-15 14:30:14 -07:00
Android (Google) Code Review
622a564e8f am 03474237: Merge change 4054 into donut
Merge commit '0347423753fb5d7207aa1ea93a8429f59468eb41'

* commit '0347423753fb5d7207aa1ea93a8429f59468eb41':
  build 'updater' binary for use in OTA packages
  Add VpnServices to PRODUCT_PACKAGES.
2009-06-14 21:12:39 -07:00
Doug Zongker
a406c1e7a1 build 'updater' binary for use in OTA packages 2009-06-12 16:57:08 -07:00
Jason Sams
e3eb0fae99 joeo here. This localize command is unused and causes that execve error. 2009-06-12 11:23:19 -07:00
Chung-yih Wang
9305cf95a8 am 67647752: Add keystore in the pathmap of frameworks base.
Merge commit '676477525bc40f7ccf196a6580480b9d44adabd8'

* commit '676477525bc40f7ccf196a6580480b9d44adabd8':
  Add keystore in the pathmap of frameworks base.
2009-06-12 08:25:39 -07:00
Jean-Michel Trivi
7e09fc130c am 4175bb90: Removing "tts" from the list of directories containing source code under frameworks/base. This directory doesn\'t exist anymore after change 3730 which moved the TTS code to frameworks/base/packages/TtsService/.
Merge commit '4175bb90ae8e454416a956b3885995e59ac0454e'

* commit '4175bb90ae8e454416a956b3885995e59ac0454e':
  Removing "tts" from the list of directories containing source code
2009-06-12 04:59:35 -07:00
Chung-yih Wang
676477525b Add keystore in the pathmap of frameworks base. 2009-06-12 07:10:26 +08:00
Jean-Michel Trivi
4175bb90ae Removing "tts" from the list of directories containing source code
under frameworks/base. This directory doesn't exist anymore after
change 3730 which moved the TTS code to frameworks/base/packages/TtsService/.
2009-06-11 10:16:52 -07:00
Android (Google) Code Review
da7f6c3d5f Merge change 3569
* changes:
  Fix the is_sdk_build check when installing the apns.
2009-06-11 05:04:06 -07:00
Android (Google) Code Review
63b5064d44 Merge change 3830
* changes:
  joeo here.  This localize command is unused and causes that execve error.
2009-06-10 18:56:34 -07:00
Jason Sams
7c805e8ee8 joeo here. This localize command is unused and causes that execve error. 2009-06-10 17:37:28 -07:00
Jaikumar Ganesh
0942768af1 Bluez4 changes
Rename hcid to bluetoothd, modify include paths, add cleanspec
2009-06-09 17:20:47 -07:00
Sriram Raman
d9f7a05830 am f1a55f8b: Fix the usual build hanging issue by using -o (overwrite without prompting) option with unzip
Merge commit 'f1a55f8bfbaa1a68d96e229b4e73c9e9209d82cf'

* commit 'f1a55f8bfbaa1a68d96e229b4e73c9e9209d82cf':
  Fix the usual build hanging issue by using -o (overwrite without prompting) option with unzip
2009-06-09 16:09:43 -07:00
Sriram Raman
f1a55f8bfb Fix the usual build hanging issue by using -o (overwrite without prompting) option with unzip
This should fix the common problem when googlelogin-client and google-framework are both included
2009-06-09 15:08:29 -07:00
Patrick Scott
1f04a3b8f4 Fix the is_sdk_build check when installing the apns.
This will install the big list of apns on non-sdk eng builds. This is very
helpful after a wipe data for those of us on Cingular.
2009-06-09 14:53:27 -04:00
Tammo Spalink
e7382b8652 am 0bb9ce9e: fix build -- aidl was not finding vpn imports
Merge commit '0bb9ce9ec3d744444019f8ea191bb63f0ba3b2d4'

* commit '0bb9ce9ec3d744444019f8ea191bb63f0ba3b2d4':
  fix build -- aidl was not finding vpn imports
2009-06-08 23:09:54 -07:00
Tammo Spalink
0bb9ce9ec3 fix build -- aidl was not finding vpn imports 2009-06-09 13:45:20 +08:00
Android Code Review
6c8cafac16 Merge change 8253
* changes:
  Update the current.xml error message.
2009-06-07 14:07:22 -07:00
Android (Google) Code Review
81d04d57f2 am a0bad432: Merge change 3237 into donut
Merge commit 'a0bad432f38f3b5105d79a1dadc1ccda061934b6'

* commit 'a0bad432f38f3b5105d79a1dadc1ccda061934b6':
  Add archquery to the windows make
2009-06-05 00:29:55 -07:00
Raphael
d8a6ac1000 Add archquery to the windows make 2009-06-04 17:02:21 -07:00
David 'Digit' Turner
3585e95918 Fix armv5te-vfp build. Aargh 2009-05-29 22:54:40 +02:00
David 'Digit' Turner
d53c81d7c5 Rename TARGET_ARCH_VERSION to TARGET_ARCH_VARIANT +
Move arch-specific definitions into core/combo/arch/arm/<variant>.mk
2009-05-29 21:36:49 +02:00
Android (Google) Code Review
ca85166e8a Merge change 2703
* changes:
  add libGLES_android.so to the prelink map, this will replace libagl.so eventually
2009-05-28 20:40:44 -07:00
Mathias Agopian
0f36b46bc0 add libGLES_android.so to the prelink map, this will replace libagl.so eventually 2009-05-28 20:40:11 -07:00
Android (Google) Code Review
fe626b775f Merge change 2631
* changes:
  Added support for TARGET_ARCH_VERSION=armv5te-vfp.
2009-05-28 15:41:55 -07:00
Andy McFadden
8f51a2ad06 Added support for TARGET_ARCH_VERSION=armv5te-vfp.
This is currently a copy & paste of the armv5te parameters.  I don't
know if there's a better way to encode this, or to what extent we will
need to specialize it vs. armv5te in a future build (e.g. to enable fp
instruction use in code gen).

Currently the only effect is to select the VFP-enabled mterp sources in
Dalvik.
2009-05-28 12:47:23 -07:00
Dima Zavin
0c72f970b0 am 46e9beca: core: Add support for static libraries to include other whole static libs.
Merge commit '46e9beca50057bd4ff375b35fd5958c05ce5bcb7'

* commit '46e9beca50057bd4ff375b35fd5958c05ce5bcb7':
  core: Add support for static libraries to include other whole static libs.
2009-05-28 12:31:35 -07:00
Dima Zavin
46e9beca50 core: Add support for static libraries to include other whole static libs.
Currently, if LOCAL_WHOLE_STATIC_LIBRARIES is specified, its values is
ignored. This patch addresses this limitation and works as follows:
For every whole lib specified, it extracts the archive into a sub-directory
under the target lib's intermediate, and then seeds the initial target
archive with all the members.

Signed-off-by: Dima Zavin <dima@android.com>
2009-05-27 20:14:55 -07:00
Doug Zongker
f55791f720 am 8b70e8c6: use minigzip instead of system gzip in the build
Merge commit '8b70e8c6574e6e6e80aaa84fe1a9426995fa0a78'

* commit '8b70e8c6574e6e6e80aaa84fe1a9426995fa0a78':
  use minigzip instead of system gzip in the build
2009-05-27 15:06:53 -07:00
Doug Zongker
8b70e8c657 use minigzip instead of system gzip in the build
Use zlib's minigzip utility, built as part of our source tree, instead of
whatever installation of GNU gzip happens to be on the user's machine.
Using zlib's deflater, which is nicely available as a library (unlike
GNU gzip's deflater) will ultimately let us do binary patches to the
boot and recovery images.
2009-05-27 14:27:45 -07:00
The Android Open Source Project
9a27222882 merged 866a6d399e with conflicts in core/binary.mk 2009-05-25 08:48:37 -07:00
Android (Google) Code Review
866a6d399e Merge change 1642 into donut
* changes:
  Allow the build system to build Objective-C sources.
2009-05-25 02:53:19 -07:00
Android (Google) Code Review
4afb4f20fc am 3026e96d: Merge change 2245 into donut
Merge commit '3026e96dcea7893d762d3ad1532c3775dfe01b60'

* commit '3026e96dcea7893d762d3ad1532c3775dfe01b60':
  Define TARGET_CPU_ABI for finding native code in .apks
2009-05-22 16:55:41 -07:00
Android (Google) Code Review
3026e96dce Merge change 2245 into donut
* changes:
  Define TARGET_CPU_ABI for finding native code in .apks
2009-05-22 16:53:05 -07:00
Android (Google) Code Review
e7a6072d2e am 6941562e: Merge change 2288 into donut
Merge commit '6941562ed3b2ca8fe315ce95bf15a0e57efb4a81'

* commit '6941562ed3b2ca8fe315ce95bf15a0e57efb4a81':
  Adding in the path the new android.tts package.
2009-05-22 16:01:23 -07:00
Dianne Hackborn
ecc70d705a Define TARGET_CPU_ABI for finding native code in .apks 2009-05-22 14:54:07 -07:00
Jack Palevich
3110264149 Add libacc to the prelink map.
Libacc is a tiny subset of C intended for use as a scripting language for
a 3D UI.
2009-05-22 12:13:32 -07:00
Robert Greenwalt
fbd10d940d Add PRODUCT_DEFAULT_WIFI_CHANNELS build var.
Allows the build to specify the default number of allowed
WIFI channels.  Part of the fix for 1625953.
2009-05-21 18:46:57 -07:00
Jean-Michel Trivi
e1da30426f Adding in the path the new android.tts package. 2009-05-21 18:44:30 -07:00
Mike Lockwood
3659b92a55 am 051672bc: Update the error message that occurs when current.xml needs regenerating.
Merge commit '051672bc6c41a5a24ed4057f9d78f5e9caaf7aef'

* commit '051672bc6c41a5a24ed4057f9d78f5e9caaf7aef':
  Update the error message that occurs when current.xml needs regenerating.
2009-05-21 09:42:35 -07:00
Mike Lockwood
051672bc6c Update the error message that occurs when current.xml needs regenerating.
We are no longer using p4 for source control and there are no longer OWNERS files.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-05-21 09:27:39 -04:00
Android (Google) Code Review
5d72f8501d Merge change 2060
* changes:
  add an entry for libbinder in the prelink map
2009-05-20 12:40:21 -07:00
David 'Digit' Turner
5dbb529de9 Allow the build system to build Objective-C sources.
This is needed to move our modified SDL sources under external/qemu/distrib.
As per joeo's request, this change also enables target Objective-C compilation, letting it error at build time.
2009-05-20 11:29:15 +02:00
Mathias Agopian
33e8306d2e add an entry for libbinder in the prelink map 2009-05-19 19:56:02 -07:00
Patrick Scott
d033d57f40 Change PRIVATE to LOCAL for additional dependencies.
This change will be used by webcore_test in a separate change.
2009-05-19 18:13:58 -04:00
The Android Open Source Project
678ea42307 merge 9bd5404a9d w/conflict 2009-05-18 13:47:57 -07:00
Dianne Hackborn
9bd5404a9d Use new aapt feature to add default version info to .apks. 2009-05-18 12:41:45 -07:00
Ed Heyl
50ca1cf796 cherry-pick bd215ed974 2009-05-15 15:02:03 -07:00
Joe Onorato
a3072e5ae5 am eefd0212: Print the platform version and version codename in the big build header.
Merge commit 'eefd0212f10ec83b21d1792130b4cad02d2ce4d5'

* commit 'eefd0212f10ec83b21d1792130b4cad02d2ce4d5':
  Print the platform version and version codename in the big build header.
2009-05-15 08:11:38 -07:00
Joe Onorato
eefd0212f1 Print the platform version and version codename in the big build header. 2009-05-15 09:10:51 -04:00
Doug Kwan
bd215ed974 Rollback to gcc-4.2.1 2009-05-14 02:17:32 -07:00
Android (Google) Code Review
a7e0325cd6 am 3de1fe6: Merge change 1529 into donut
Merge commit '3de1fe627073608270f844714f24ed83ed4266db'

* commit '3de1fe627073608270f844714f24ed83ed4266db':
  Fix makefile to be compatible with findbugs v 1.3.8
2009-05-13 14:15:30 -07:00
Dianne Hackborn
ab1e594c5d Update build version to Eclair. 2009-05-13 13:21:02 -07:00
Andrew Stadler
cef9ed98ac Fix makefile to be compatible with findbugs v 1.3.8
modified:   core/java.mk
2009-05-13 00:44:59 -07:00
Phil Dubach
502e9c8437 am 233728d: am 9e35a86: AI 148675: CTS: Copy only the \'startcts\' scrip
Merge commit '233728de06f3ce711c0be94d5a3427bc007674a3'

* commit '233728de06f3ce711c0be94d5a3427bc007674a3':
  AI 148675: CTS: Copy only the 'startcts' script into the cts distribution
2009-05-11 11:09:33 -07:00
Phil Dubach
233728de06 am 9e35a86: AI 148675: CTS: Copy only the \'startcts\' script into the cts
Merge commit '9e35a86b833c8bd520c9f889be3f2859a5ed7b45' into donut

* commit '9e35a86b833c8bd520c9f889be3f2859a5ed7b45':
  AI 148675: CTS: Copy only the 'startcts' script into the cts distribution
2009-05-11 11:03:44 -07:00
Phil Dubach
9e35a86b83 AI 148675: CTS: Copy only the 'startcts' script into the cts distribution
Before CL 148645, 'startcts' called the 'cts' script. This is no longer the
  case, so we want to exclude the 'cts' script from the distribution to avoid
  confusion. The 'cts' script is only used when running cts directly on a
  fully built source tree.

Automated import of CL 148675
2009-05-11 11:00:16 -07:00
Dianne Hackborn
0a6d796829 am 9537884: Add new property for dev codename, update version to Donut.
Merge commit '9537884b0dabe81bf612c79d12c7b4bf40de10a5'

* commit '9537884b0dabe81bf612c79d12c7b4bf40de10a5':
  Add new property for dev codename, update version to Donut.
2009-05-08 13:52:08 -07:00
Dianne Hackborn
9537884b0d Add new property for dev codename, update version to Donut. 2009-05-08 13:03:08 -07:00
Dima Zavin
93a2620946 am 6ea3b88: core: Recovery image should have the custom kernel base as w
Merge commit '6ea3b8856d656752c0310ca237ed99e7451be83b'

* commit '6ea3b8856d656752c0310ca237ed99e7451be83b':
  core: Recovery image should have the custom kernel base as well.
2009-05-08 11:19:04 -07:00
Dima Zavin
6ea3b8856d core: Recovery image should have the custom kernel base as well.
Signed-off-by: Dima Zavin <dima@android.com>
2009-05-07 21:10:41 -07:00
Dima Zavin
c2e63593e5 am 1e0847c: core: Allow the board config to specify the kernel base addr
Merge commit '1e0847c2fcbe1b95464f32a719d2b9e620d1e6ec'

* commit '1e0847c2fcbe1b95464f32a719d2b9e620d1e6ec':
  core: Allow the board config to specify the kernel base address for mkbootimg
2009-05-07 19:59:48 -07:00
Dima Zavin
1e0847c2fc core: Allow the board config to specify the kernel base address for mkbootimg
Signed-off-by: Dima Zavin <dima@android.com>
2009-05-07 19:50:51 -07:00
Jorg Pleumann
9b659a23b0 am 1f61dc3: am 6178820: AI 148430: Adding a new CTS test runner that is
Merge commit '1f61dc3e19f1a18dabbc11ce6cf4a62851933ad0'

* commit '1f61dc3e19f1a18dabbc11ce6cf4a62851933ad0':
  AI 148430: Adding a new CTS test runner that is basically
2009-05-07 01:41:12 -07:00
Jorg Pleumann
1f61dc3e19 am 6178820: AI 148430: Adding a new CTS test runner that is basically
Merge commit '6178820340ccca2656fab0953bbe77da2e3e4bb7' into donut

* commit '6178820340ccca2656fab0953bbe77da2e3e4bb7':
  AI 148430: Adding a new CTS test runner that is basically
2009-05-07 01:36:23 -07:00
Jorg Pleumann
6178820340 AI 148430: Adding a new CTS test runner that is basically
a copy of the old one, but resides in android/cts
  and is built and installed as part of the CTS.
  This makes sure we always have the correct test
  runner on a device, so we should see the various
  improvements also on off-the-shelf Cupcake phones.
  BUG=1537738

Automated import of CL 148430
2009-05-07 01:33:14 -07:00
San Mehat
e36c4a5b0b am 6ffb159: prelink: Add libsysutils to prelink map
Merge commit '6ffb159a8be65e2a63f17cc35f57e79e3e26809b'

* commit '6ffb159a8be65e2a63f17cc35f57e79e3e26809b':
  prelink: Add libsysutils to prelink map
2009-05-06 16:43:54 -07:00
San Mehat
6ffb159a8b prelink: Add libsysutils to prelink map
Signed-off-by: San Mehat <san@google.com>
2009-05-06 11:24:13 -07:00
Dave Bort
8acd848320 Merge commit '9528248' into master
Conflicts:
	core/combo/linux-arm.mk

Signed-off-by: Dave Bort <dbort@android.com>
2009-05-05 17:04:51 -07:00
Dave Bort
952824843b core: Don't debug native modules when TARGET_BUILD_TYPE==debug
Don't make the simulator default to debug mode.

Remove all global "debug" {C,CPP}FLAGS, which are no longer used.
2009-05-04 18:12:32 -07:00
Android (Google) Code Review
e159bea824 Merge change 954
* changes:
  Extend build system to compile generated "C" files.
2009-05-04 15:41:01 -07:00
Jack Palevich
e7b3e2c62e Extend build system to compile generated "C" files.
Until now only generated assembly or C++ files would be compiled. This patch extends the build
system to compile generated C files as well. The new rule is modeled on the existing rules for
compiling generated C++ files and the existing rule for compiling ordinary C files.
2009-05-04 15:03:23 -07:00
James Dong
b41e725eae merged 2d2a9acac2 with conflicts.... 2009-05-04 11:23:14 -07:00
Android (Google) Code Review
6062815e2e Merge change 859 into donut
* changes:
  Change 77 from git master branch: change the prelink-linux-arm.map to include OC 2.0 new shared libs - remove redundant share lib from the map - remove 2way share lib from the map
2009-05-01 14:08:59 -07:00
James Dong
2d2a9acac2 Change 77 from git master branch:
change the prelink-linux-arm.map to include OC 2.0 new shared libs
- remove redundant share lib from the map
- remove 2way share lib from the map
2009-05-01 11:34:17 -07:00
Doug Kwan
6fa3704187 am 8c9bef6: switch compiler to gcc-4.3.1
Merge commit '8c9bef616666ee8c6d5cc9243f3d89c44d15d216'

* commit '8c9bef616666ee8c6d5cc9243f3d89c44d15d216':
  switch compiler to gcc-4.3.1
2009-04-30 18:11:11 -07:00
Joe Onorato
2f5b79ef04 am 7b2845a: Don\'t rebuild the NOTICE files when building with mm, mmm, e
Merge commit '7b2845ab1a47324a6fb25261048510e79656a732'

* commit '7b2845ab1a47324a6fb25261048510e79656a732':
  Don't rebuild the NOTICE files when building with mm, mmm, etc.
2009-04-30 16:52:20 -07:00
Doug Kwan
8c9bef6166 switch compiler to gcc-4.3.1
Switch default ARM compiler to gcc-4.3.1 for Neon support.
2009-04-30 15:04:28 -07:00
Joe Onorato
7b2845ab1a Don't rebuild the NOTICE files when building with mm, mmm, etc. 2009-04-30 13:52:50 -07:00
Phil Dubach
6cdbde9489 am e3a5777: am ccd2def: AI 147847: CTS: Fix core test dependencies in CT
Merge commit 'e3a5777a67b09bd54500c1b78c714972fa4793ef'

* commit 'e3a5777a67b09bd54500c1b78c714972fa4793ef':
  AI 147847: CTS: Fix core test dependencies in CTS makefile
2009-04-29 11:02:43 -07:00
Bill Napier
4fa1f8e3bc am e468abd: am f22b9a0: AI 147775: Also add ApiDemos to make sure it get
Merge commit 'e468abda1c64923908ae711743d3e8c9f1b4a477'

* commit 'e468abda1c64923908ae711743d3e8c9f1b4a477':
  AI 147775: Also add ApiDemos to make sure it gets included in the TestCase repository as
2009-04-29 11:02:43 -07:00
Jorg Pleumann
56d4db7d7a am ecc08d0: am b3e0126: AI 147731: Forgot to submit the build changes fo
Merge commit 'ecc08d02b18f67a84df2f69e0d807761fc8dad15'

* commit 'ecc08d02b18f67a84df2f69e0d807761fc8dad15':
  AI 147731: Forgot to submit the build changes for the
2009-04-29 11:02:43 -07:00
Bill Napier
12ff9f3925 am 41ddfa9: am f23f5b4: AI 147479: Update list of CTS test packages.
Merge commit '41ddfa903fe4e91e51d978d30bbbe6748ed1f100'

* commit '41ddfa903fe4e91e51d978d30bbbe6748ed1f100':
  AI 147479: Update list of CTS test packages.
2009-04-29 11:02:43 -07:00
Android (Google) Code Review
bf1de8cbc9 am a47b47a: Merge change 530 into donut
Merge commit 'a47b47ad120b6410b2159722680907c53217c09c'

* commit 'a47b47ad120b6410b2159722680907c53217c09c':
  Remove obsolete activitycreator from windows SDK makefile.
2009-04-29 11:02:43 -07:00
Phil Dubach
e3a5777a67 am ccd2def: AI 147847: CTS: Fix core test dependencies in CTS makefile
Merge commit 'ccd2def288d02ce5adab10bb28878fff05b70aed' into donut

* commit 'ccd2def288d02ce5adab10bb28878fff05b70aed':
  AI 147847: CTS: Fix core test dependencies in CTS makefile
2009-04-28 21:52:48 -07:00
Bill Napier
e468abda1c am f22b9a0: AI 147775: Also add ApiDemos to make sure it gets included i
Merge commit 'f22b9a0ad531f66eb0b5710abae1feefecc42c2b' into donut

* commit 'f22b9a0ad531f66eb0b5710abae1feefecc42c2b':
  AI 147775: Also add ApiDemos to make sure it gets included in the TestCase repository as
2009-04-28 21:52:48 -07:00
Jorg Pleumann
ecc08d02b1 am b3e0126: AI 147731: Forgot to submit the build changes for the
Merge commit 'b3e0126a7a2d32fbae2638e9419739d2d3907c40' into donut

* commit 'b3e0126a7a2d32fbae2638e9419739d2d3907c40':
  AI 147731: Forgot to submit the build changes for the
2009-04-28 21:52:48 -07:00
Bill Napier
41ddfa903f am f23f5b4: AI 147479: Update list of CTS test packages.
Merge commit 'f23f5b486650a923e58e3e79b8ec23cc725b7b33' into donut

* commit 'f23f5b486650a923e58e3e79b8ec23cc725b7b33':
  AI 147479: Update list of CTS test packages.
2009-04-28 21:52:48 -07:00
Phil Dubach
ccd2def288 AI 147847: CTS: Fix core test dependencies in CTS makefile
The core test descriptions did not list all dependencies. When building cts
  for the first time, the descriptions were generated before the cts
  repository was erased.
  BUG=1813815

Automated import of CL 147847
2009-04-27 12:07:38 -07:00
Bill Napier
f22b9a0ad5 AI 147775: Also add ApiDemos to make sure it gets included in the TestCase repository as
well.
  BUG=1810821

Automated import of CL 147775
2009-04-24 18:26:58 -07:00
The Android Open Source Project
98dce16df0 Merge commit 'korg/donut' 2009-04-24 13:54:55 -07:00
Jorg Pleumann
b3e0126a7a AI 147731: Forgot to submit the build changes for the
luni.AllTests removal.

Automated import of CL 147731
2009-04-24 13:40:00 -07:00
Raphael
9058e7293e Remove obsolete activitycreator from windows SDK makefile. 2009-04-23 18:58:26 -07:00
Bill Napier
f23f5b4866 AI 147479: Update list of CTS test packages.
Automated import of CL 147479
2009-04-23 10:14:59 -07:00
Phil Dubach
0a4c2b02d0 AI 147397: CTS: Fix VM test description generator
Automated import of CL 147397
2009-04-22 11:56:14 -07:00
Urs Grob
8e5df6c024 Merge branch 'readonly-p4-master' 2009-04-18 22:45:40 -07:00
Urs Grob
4a27b76491 AI 146827: am: CL 146742 am: CL 146710 Splitting android.core.tests.apk into several smaller
apks. Each libcore module gets one apk and luni gets 4.
  Original author: ursg
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146827
2009-04-18 22:44:31 -07:00
Urs Grob
b3c6b2df48 AI 146742: am: CL 146710 Splitting android.core.tests.apk into several smaller
apks. Each libcore module gets one apk and luni gets 4.
  Original author: ursg
  Merged from: //branches/cupcake/...

Automated import of CL 146742
2009-04-17 11:27:08 -07:00
Urs Grob
709b752e3b AI 146710: Splitting android.core.tests.apk into several smaller
apks. Each libcore module gets one apk and luni gets 4.
  BUG=1789657

Automated import of CL 146710
2009-04-17 02:07:14 -07:00
Raphael Moll
1032d83d51 Merge branch 'readonly-p4-master' 2009-04-16 10:55:25 -07:00
Raphael Moll
a779a05e7e AI 146498: am: CL 145983 am: CL 145911 ADT #1778786: tool to generate stubbed jar file.
This is only a preliminary CL. More will follow but this is
  a good start, with the following caveats:
  What it does:
  - take an input jar, a list of includes, a list of excludes.
  - generate actual Java source for the filtered classes.
  What it doesn't do yet:
  - some more work on filtering inner elements (methods, etc.)
  - properly generate inner classes.
  - hide synthetic fields.
  - some classes body are missing
  - directly generate a stubbed bytecode/jar rather than source.
  I'll likely want to keep the source generator for debugging
  purposes or if we want to integrate with a build system instead.
  - classpath will be changed in the final CL to refer to the external
  ASM lib rather than the project. I need the source for debugging
  rigth now.
  - will review comments before submitting.
  Original author: raphael
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146498
2009-04-16 10:54:10 -07:00
The Android Open Source Project
e53ceac5e2 Merge commit 'korg/cupcake' 2009-04-14 18:17:59 -07:00
Android (Google) Code Review
817a7ba786 Merge change 77
* changes:
  Squashed commit of the following:
2009-04-14 10:47:35 -07:00
Jianhong Jiang
7953e3000f Squashed commit of the following:
commit 191a8bc426782720b38d2af2151f654dc3241ffe
Author: Jianhong Jiang <jianhong@google.com>
Date:   Mon Apr 13 11:06:07 2009 -0700

    Change tabs into 4 spaces.

commit f47721ac22c353a93ddf56e3bd6ca21c01ad7091
Author: Jianhong Jiang <jianhong@google.com>
Date:   Fri Apr 10 14:14:05 2009 -0700

    OpenCore 2.02 prelink map change.
2009-04-13 18:58:11 -07:00
Raphael Moll
a190c523af AI 145983: am: CL 145911 ADT #1778786: tool to generate stubbed jar file.
This is only a preliminary CL. More will follow but this is
  a good start, with the following caveats:
  What it does:
  - take an input jar, a list of includes, a list of excludes.
  - generate actual Java source for the filtered classes.
  What it doesn't do yet:
  - some more work on filtering inner elements (methods, etc.)
  - properly generate inner classes.
  - hide synthetic fields.
  - some classes body are missing
  - directly generate a stubbed bytecode/jar rather than source.
  I'll likely want to keep the source generator for debugging
  purposes or if we want to integrate with a build system instead.
  - classpath will be changed in the final CL to refer to the external
  ASM lib rather than the project. I need the source for debugging
  rigth now.
  - will review comments before submitting.
  Original author: raphael
  Merged from: //branches/cupcake/...

Automated import of CL 145983
2009-04-13 18:21:16 -07:00
Joe Onorato
50d911553b Merge branch 'readonly-p4-master' 2009-04-13 16:33:27 -07:00
Joe Onorato
eb19b3e0d1 AI 146003: am: CL 145850 am: CL 145512 SDK add-on updates
- rename the directory and zip file
  - make it build to the dist directory
  Original author: joeo
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146003
2009-04-13 16:32:16 -07:00
Andy McFadden
801cfe2a50 Merge branch 'readonly-p4-master' 2009-04-13 14:49:50 -07:00
Andy McFadden
743e250b30 AI 145942: Enable type-precise GC on sapphire builds.
Automated import of CL 145942
2009-04-13 14:48:35 -07:00
Raphael Moll
a7bfb4f382 AI 145911: ADT #1778786: tool to generate stubbed jar file.
This is only a preliminary CL. More will follow but this is
  a good start, with the following caveats:
  What it does:
  - take an input jar, a list of includes, a list of excludes.
  - generate actual Java source for the filtered classes.
  What it doesn't do yet:
  - some more work on filtering inner elements (methods, etc.)
  - properly generate inner classes.
  - hide synthetic fields.
  - some classes body are missing
  - directly generate a stubbed bytecode/jar rather than source.
  I'll likely want to keep the source generator for debugging
  purposes or if we want to integrate with a build system instead.
  - classpath will be changed in the final CL to refer to the external
  ASM lib rather than the project. I need the source for debugging
  rigth now.
  - will review comments before submitting.
  BUG=1778786

Automated import of CL 145911
2009-04-13 12:53:33 -07:00
Joe Onorato
681925681a Fix the warning about NOTICE files overriding previous targets.
Use a different name for prebuilt libraries based on their LOCAL_MODULE --
they were all colliding using the same name, javalib.jar.  These names
are synthetic, since the libraries don't actually exist on the device
as such.
2009-04-13 12:51:43 -04:00
Joe Onorato
03fbe40d53 AI 145850: am: CL 145512 SDK add-on updates
- rename the directory and zip file
  - make it build to the dist directory
  Original author: joeo
  Merged from: //branches/cupcake/...

Automated import of CL 145850
2009-04-13 08:31:16 -07:00
Mike Lockwood
f22bf51669 Merge branch 'readonly-p4-master' 2009-04-10 06:36:47 -07:00
Mike Lockwood
ed8b386128 AI 145705: am: CL 145704 Manually integrate change 145576 to donutburger to fix "lunch"
Original author: lockwood

Automated import of CL 145705
2009-04-10 06:35:35 -07:00
Mike Lockwood
8539929a12 AI 145704: Manually integrate change 145576 to donutburger to fix "lunch"
Automated import of CL 145704
2009-04-10 06:34:59 -07:00
Joe Onorato
44a48f7d77 Merge branch 'readonly-p4-master' 2009-04-09 20:45:06 -07:00
Joe Onorato
4c096ad580 AI 145659: am: CL 145621 am: CL 145373 remove a debugging printf that sometimes breaks the build
because the commandline is too long
  Original author: joeo
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 145659
2009-04-09 20:43:57 -07:00
Joe Onorato
fbac5ec731 Merge branch 'readonly-p4-master' 2009-04-09 20:37:13 -07:00
Joe Onorato
214a42bbb6 AI 145655: am: CL 145618 am: CL 145333 Cloned from CL 144759 by 'g4 patch'.
Original change by joeo@abreu on 2009/04/06 19:54:13.
  Implement SDK add-ons in the build system.
  - Add an option to use the standard javadoc doclet instead
  of droiddoc, since droiddocs non-sdk templates aren't
  ready for prime time.
  - Add the notion of a stubs for a library.  It's only
  implemented for java libraries, but when we do native
  libraries in the NDK or sdk-addons, it will work there too.
  Original author: joeo
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 145655
2009-04-09 20:36:06 -07:00
Joe Onorato
92f8a3a7c3 AI 145621: am: CL 145373 remove a debugging printf that sometimes breaks the build
because the commandline is too long
  Original author: joeo
  Merged from: //branches/cupcake/...

Automated import of CL 145621
2009-04-09 19:39:15 -07:00
Joe Onorato
64d85d0d82 AI 145618: am: CL 145333 Cloned from CL 144759 by 'g4 patch'.
Original change by joeo@abreu on 2009/04/06 19:54:13.
  Implement SDK add-ons in the build system.
  - Add an option to use the standard javadoc doclet instead
  of droiddoc, since droiddocs non-sdk templates aren't
  ready for prime time.
  - Add the notion of a stubs for a library.  It's only
  implemented for java libraries, but when we do native
  libraries in the NDK or sdk-addons, it will work there too.
  Original author: joeo
  Merged from: //branches/cupcake/...

Automated import of CL 145618
2009-04-09 19:31:12 -07:00
Dave Bort
ef09681e42 AI 145576: Probe for the proper sed(1) extended regex switch
Automated import of CL 145576
2009-04-09 17:20:55 -07:00
Joe Onorato
15ca0bd5d0 AI 145512: SDK add-on updates
- rename the directory and zip file
  - make it build to the dist directory

Automated import of CL 145512
2009-04-09 14:20:30 -07:00
Joe Onorato
a9cc3ca8be AI 145373: remove a debugging printf that sometimes breaks the build
because the commandline is too long

Automated import of CL 145373
2009-04-09 12:05:55 -07:00
Joe Onorato
8bbfe659d7 AI 145333: Cloned from CL 144759 by 'g4 patch'.
Original change by joeo@abreu on 2009/04/06 19:54:13.
  Implement SDK add-ons in the build system.
  - Add an option to use the standard javadoc doclet instead
  of droiddoc, since droiddocs non-sdk templates aren't
  ready for prime time.
  - Add the notion of a stubs for a library.  It's only
  implemented for java libraries, but when we do native
  libraries in the NDK or sdk-addons, it will work there too.

Automated import of CL 145333
2009-04-09 10:17:32 -07:00
Jean-Baptiste Queru
e34380bea4 revert prelink map to match OpenCORE 1.0 2009-04-08 14:38:13 -07:00
Ravi K Yenduri
be8708351a Enable OpenCORE on master - part 3 2009-04-08 14:37:50 -07:00
Xavier Ducrohet
8f9b9d52fd Merge branch 'readonly-p4-master' 2009-04-06 20:33:25 -07:00
Xavier Ducrohet
f3e79f9041 AI 144767: am: CL 144765 am: CL 144764 Fix the SDK build to properly package what needs to go in the system image (bug #1761105)
Original author: xav
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 144767
2009-04-06 20:32:24 -07:00
Xavier Ducrohet
6a769427c8 AI 144765: am: CL 144764 Fix the SDK build to properly package what needs to go in the system image (bug #1761105)
Original author: xav
  Merged from: //branches/cupcake/...

Automated import of CL 144765
2009-04-06 20:30:02 -07:00
Xavier Ducrohet
f39ac4218b AI 144764: Fix the SDK build to properly package what needs to go in the system image (bug #1761105)
BUG=1761105

Automated import of CL 144764
2009-04-06 20:29:27 -07:00
Android Code Review
57d1b24414 Merge change 9452
* changes:
  Ensure that /system/etc/vold.conf is created in the "generic" product. This is necessary to let the emulator mount SD Card images properly through the "vold" mounting daemon
2009-04-06 12:08:55 -07:00
Sean McNeil
d47804e929 Provide LOCAL_DIR as some product variables might need a reference directory (i.e. PRODUCT_COPY_FILES).
Change from LOCAL_DIR to LOCAL_PATH
2009-04-04 18:46:13 +07:00
Doug Zongker
d9290f2a0f Merge branch 'readonly-p4-master' 2009-04-02 10:21:16 -07:00
Doug Zongker
32a27c8577 AI 144157: Manually integrate 144143 from donut to fix build.
Automated import of CL 144157
2009-04-02 10:20:05 -07:00
Doug Zongker
06f93798f4 Merge branch 'readonly-p4-master' 2009-04-02 10:13:30 -07:00
Doug Zongker
7cb8e199b4 AI 144132: am: CL 144130 Don't build OTA package keys into the recovery binary; read
them from an external file in the recovery image.  Use the
  test-keys for all builds.
  Original author: dougz
  Merged from: //branches/donutburger/...

Automated import of CL 144132
2009-04-02 10:12:24 -07:00
Doug Zongker
934de9b758 AI 144143: Define OTA_PUBLIC_KEYS to be the test keys in the otapackage
target as well.

Automated import of CL 144143
2009-04-02 01:15:57 -07:00
Doug Zongker
17c83cf22c AI 144130: Don't build OTA package keys into the recovery binary; read
them from an external file in the recovery image.  Use the
  test-keys for all builds.

Automated import of CL 144130
2009-04-01 15:48:46 -07:00
David 'Digit' Turner
ff2c9deb79 Ensure that /system/etc/vold.conf is created in the "generic" product.
This is necessary to let the emulator mount SD Card images properly through the "vold" mounting daemon
2009-04-01 15:26:07 +02:00
The Android Open Source Project
3c9e08a9ff Merge commit 'goog/readonly-p4-master' 2009-03-31 21:34:23 -07:00
Raphael Moll
d9b64e1350 AI 143880: am: CL 143879 am: CL 143876 Include hprof-conv in SDK (bug #1640225)
Original author: raphael
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143880
2009-03-31 17:20:53 -07:00
Raphael Moll
a401b054a4 AI 143879: am: CL 143876 Include hprof-conv in SDK (bug #1640225)
Original author: raphael
  Merged from: //branches/cupcake/...

Automated import of CL 143879
2009-03-31 17:19:14 -07:00
Raphael Moll
e340277c06 AI 143876: Include hprof-conv in SDK (bug #1640225)
BUG=1640225

Automated import of CL 143876
2009-03-31 17:16:45 -07:00
Ravi K Yenduri
452c5b35e2 Enable OpenCORE on master - part 3 2009-03-31 12:11:26 -07:00
Jean-Baptiste Queru
e3a08f2a1f Fix build: disable OpenCORE by default.
Fixes http://b.android.com/2308

This is not meant to be a permanent fix, but since everyone except
a handful of people need this, it's easier to set it for everyone
and have that handful of people unset is locally than to force
everyone to make a local tweak.
2009-03-31 09:34:55 -07:00
Jean-Baptiste Queru
3eb9e18159 Fix build: disable OpenCORE by default.
Fixes http://b.android.com/2308

This is not meant to be a permanent fix, but since everyone except
a handful of people need this, it's easier to set it for everyone
and have that handful of people unset is locally than to force
everyone to make a local tweak.
2009-03-30 16:05:57 -07:00
The Android Open Source Project
8ac438f110 Merge branch 'open_source' into google_internal
Conflicts:
	core/build_id.mk
2009-03-29 08:55:26 -07:00
The Android Open Source Project
1379256b55 Merge commit 'korg/cupcake' 2009-03-27 15:30:35 -07:00
Eric Fischer
35354dc754 Automated import from //branches/donutburger/...@142719,142719 2009-03-25 17:01:21 -07:00
Eric Fischer
7bbec3ab97 Automated import from //branches/master/...@142758,142758 2009-03-25 16:12:29 -07:00
Eric Fischer
436aefc2d0 Automated import from //branches/cupcake/...@142639,142639 2009-03-25 15:21:11 -07:00
Fredrik Markström
b7990f700b Modify linux-arm.mk to support the armv4t architecture instead of armv4.
armv4 was only implemented on StrongArm and Arm8 (See http://en.wikipedia.org/wiki/ARM_architecture)
and will be more difficult to support since it does not support the bx instruction.
armv4t on the other hand is used in a wide range of cpu:s.
armv4 is also not supported by bionic or dalvik, but armv4t is.

Thumb-mode is not yet enabled since there are some unresolved abi-issues.
2009-03-25 13:20:37 +01:00
Sriram Raman
4bb2b38d7d Automated import from //branches/master/...@142411,142411 2009-03-24 22:47:20 -07:00