git.osdn.net Git - android-x86/build.git/log

Use PRIVATE_CXX in HOST modules.

This fixes the build error:
out/host/linux-x86/obj/SHARED_LIBRARIES/libneo_util_intermediates/neo_err.o:
file not recognized: File format not recognized
See also CL #84578

Change-Id: Ib91230c7a5c9809eb1935959eaa9be8fa7c596b9

commit | commitdiff | tree

The Android Automerger [Mon, 20 Dec 2010 15:38:58 +0000 (07:38 -0800)]

HRH81

Change-Id: I85f6060794ae9cd97424632aa7516d6381a9e66e

commit | commitdiff | tree

Sriram Raman [Fri, 17 Dec 2010 23:31:42 +0000 (18:31 -0500)]

HRH78B

Change-Id: I65eb4397d97f4d4867009f256e77aad144e56cff

commit | commitdiff | tree

The Android Automerger [Fri, 17 Dec 2010 21:44:54 +0000 (13:44 -0800)]

HRH78

Change-Id: I4b30ef0932212edf0e77cd4f81fff0feba14e843

commit | commitdiff | tree

The Android Automerger [Fri, 17 Dec 2010 21:44:52 +0000 (13:44 -0800)]

Merge branch 'master' into honeycomb-release

* master:
DO NOT MERGE: The API version changed and a bunch of stuff needs rebuilding, so just wipe $(OUT_DIR).

commit | commitdiff | tree

Sriram Raman [Fri, 17 Dec 2010 01:17:36 +0000 (20:17 -0500)]

HRH77B

Change-Id: Ic22ccd5d3cbfa6d72e92761895be6bc55ee5a9d0

commit | commitdiff | tree

Jean-Baptiste Queru [Fri, 17 Dec 2010 00:04:26 +0000 (16:04 -0800)]

am 28599d02: Ignore 9bfb8142 from gingerbread

* commit '28599d022e80651c2f21274d6055b03f4154d3e1':
DO NOT MERGE: The API version changed and a bunch of stuff needs rebuilding, so just wipe $(OUT_DIR).

commit | commitdiff | tree

Jean-Baptiste Queru [Thu, 16 Dec 2010 23:43:46 +0000 (15:43 -0800)]

Ignore 9bfb8142 from gingerbread

Change-Id: Ie0ec4fc224d23516906b9ca750c5200aa7fbf63c

commit | commitdiff | tree

The Android Automerger [Thu, 16 Dec 2010 15:39:12 +0000 (07:39 -0800)]

HRH77

Change-Id: I2d96ff14e7f22eff0dd4989029be45fe834774e6

commit | commitdiff | tree

The Android Automerger [Thu, 16 Dec 2010 15:39:01 +0000 (07:39 -0800)]

Merge branch 'master' into honeycomb-release

* master:
Scrub the set of dalvik modules that are built by default
Add framework includes for any aidl source.

commit | commitdiff | tree

Jeff Hamilton [Thu, 16 Dec 2010 00:29:40 +0000 (18:29 -0600)]

DO NOT MERGE: The API version changed and a bunch of stuff needs rebuilding, so just wipe $(OUT_DIR).

Change-Id: I7b6c291db3ec09c7b53949a04cc792912004a1de

commit | commitdiff | tree

android-merger [Wed, 15 Dec 2010 23:22:22 +0000 (15:22 -0800)]

HRH76B

Change-Id: I58e32f2bb80f9de6b2c4a85f9c0342f4cbef5f1a

commit | commitdiff | tree

Brian Carlstrom [Wed, 15 Dec 2010 21:21:21 +0000 (13:21 -0800)]

Merge "Scrub the set of dalvik modules that are built by default"

commit | commitdiff | tree

Ying Wang [Wed, 15 Dec 2010 21:18:23 +0000 (13:18 -0800)]

Merge "Add framework includes for any aidl source."

commit | commitdiff | tree

The Android Automerger [Wed, 15 Dec 2010 15:31:35 +0000 (07:31 -0800)]

HRH76

Change-Id: Icb9b7d148905a6594bae7003a7bf69c1c7fe96ed

commit | commitdiff | tree

The Android Automerger [Wed, 15 Dec 2010 15:31:25 +0000 (07:31 -0800)]

Merge branch 'master' into honeycomb-release

commit | commitdiff | tree

Brian Carlstrom [Wed, 15 Dec 2010 06:35:10 +0000 (22:35 -0800)]

Scrub the set of dalvik modules that are built by default

Bug: 3009435
Change-Id: I20d88df665e48aa74c20cef7e236de377cd0d14b

commit | commitdiff | tree

Jean-Baptiste Queru [Wed, 15 Dec 2010 00:26:34 +0000 (16:26 -0800)]

am 34e82671: resolved conflicts for merge of 76aa8d0a to gingerbread-plus-aosp

* commit '34e826718e99d56da38ecd5ffd8873997722fa92':
update API version to 9

commit | commitdiff | tree

Jean-Baptiste Queru [Wed, 15 Dec 2010 00:23:19 +0000 (16:23 -0800)]

resolved conflicts for merge of 76aa8d0a to gingerbread-plus-aosp

Change-Id: I7fa43d5b5d52b68baca3e4848cd308fea1d1fb98

commit | commitdiff | tree

Jean-Baptiste Queru [Wed, 15 Dec 2010 00:16:44 +0000 (16:16 -0800)]

update API version to 9

Change-Id: Ia573996bb910e19c8f7017ca13cf9d9d77083404

commit | commitdiff | tree

Jean-Baptiste Queru [Wed, 15 Dec 2010 00:15:12 +0000 (16:15 -0800)]

am 3463d0e1: (-s ours) resolved conflicts for merge of c1b33081 to gingerbread-plus-aosp - DO NOT MERGE

* commit '3463d0e1026263d9d740c3324138a346b0c9006d':
(DO NOT MERGE) Issue #3255640: Need to bump GB to API 10 version name "2.4"

commit | commitdiff | tree

Jean-Baptiste Queru [Wed, 15 Dec 2010 00:11:06 +0000 (16:11 -0800)]

resolved conflicts for merge of c1b33081 to gingerbread-plus-aosp - DO NOT MERGE

Change-Id: I785e36efe89cc11e2dacfb4a30901be93453f221

commit | commitdiff | tree

android-merger [Tue, 14 Dec 2010 23:38:00 +0000 (15:38 -0800)]

HRH75B

Change-Id: If2ca80750e06d198f9fd18fec6f8e819422bbd6c

commit | commitdiff | tree

Dianne Hackborn [Tue, 14 Dec 2010 19:30:43 +0000 (11:30 -0800)]

(DO NOT MERGE) Issue #3255640: Need to bump GB to API 10 version name "2.4"

We are now version 2.4, API 10.

Change-Id: I5876ee7cdd1c6e4115dbe79d426f678e8d354449

commit | commitdiff | tree

Ying Wang [Tue, 14 Dec 2010 18:57:54 +0000 (10:57 -0800)]

Add framework includes for any aidl source.

Before this change, only aidl in apps gets the framework directories in
their include path.

Change-Id: Ieeaa162f577ea280fe71e4959cc73176b4dfd8ad

commit | commitdiff | tree

The Android Automerger [Tue, 14 Dec 2010 15:29:58 +0000 (07:29 -0800)]

HRH75

Change-Id: I435a2931d619a1ca01e3f1a9541940ae38e2d4ec

commit | commitdiff | tree

The Android Automerger [Tue, 14 Dec 2010 15:29:37 +0000 (07:29 -0800)]

Merge branch 'master' into honeycomb-release

commit | commitdiff | tree

David 'Digit' Turner [Tue, 14 Dec 2010 10:45:58 +0000 (02:45 -0800)]

am efc5d814: am 15f4980d: Merge "Add support for custom Linux host toolchains when building the SDK." into gingerbread

* commit 'efc5d81428a8c7d9cf7cb7b3a5f1a8344b02a700':
Add support for custom Linux host toolchains when building the SDK.

commit | commitdiff | tree

David 'Digit' Turner [Tue, 14 Dec 2010 10:42:10 +0000 (02:42 -0800)]

am 15f4980d: Merge "Add support for custom Linux host toolchains when building the SDK." into gingerbread

* commit '15f4980d510824113a4d2b71d70de9c67715f3dc':
Add support for custom Linux host toolchains when building the SDK.

commit | commitdiff | tree

David 'Digit' Turner [Tue, 14 Dec 2010 10:37:05 +0000 (02:37 -0800)]

Merge "Add support for custom Linux host toolchains when building the SDK." into gingerbread

commit | commitdiff | tree

Brian Carlstrom [Mon, 13 Dec 2010 21:20:21 +0000 (13:20 -0800)]

Merge "Unify target and host Java compilation"

commit | commitdiff | tree

android-merger [Mon, 13 Dec 2010 20:23:42 +0000 (12:23 -0800)]

HRH74B

Change-Id: I83330e87e293dc2341fc32c9b2e1f5648b5bc7ec

commit | commitdiff | tree

Brian Carlstrom [Fri, 10 Dec 2010 20:10:24 +0000 (12:10 -0800)]

Unify target and host Java compilation

This changes tries to reconcile drift between
transform-java-to-classes.jar which is used to build java for the
target with transform-host-java-to-package which is used for the
host. Several packages such as libcore are built both ways and the
drift between these rules was making it hard to make common changes to
things such as warning options.

The new compile-javac definition tries to include as much as possible
from the two previous definitions. Some conflicts it sorts out:
- hardwired -g vs PRIVATE_JAVAC_DEBUG_FLAGS
- consistent order of arguments
- moving PRIVATE_JAVAC_FLAGS to end to allow override of arguments
- xlint_unchecked is always conditional based on LOCAL_WARNINGS_ENABLE

Now what differs between the two is clear in the
transform-java-to-classes and transform-host-java-to-package
definitions. Notable differences:
- the target case supplies a bootclasspath while the host case does not.
- .class files are cleaned up after jaring in the target case,
  but in the cost case they are left for the sake of the vm-tests target
  which expects them to be present. That should probably be fixed in the future.
- PRIVATE_EXTRA_JAR_ARGS used to package resources into the jar only
  happens for the host. Its handled by add-java-resources-to-package for the
  target after dxing.

Change-Id: I2fb28f688fbb632102ca63448c2ac911db0477ae

commit | commitdiff | tree

Daniel Sandler [Mon, 13 Dec 2010 17:46:17 +0000 (12:46 -0500)]

Protips: End of line.

Bug: 3248626
Change-Id: Iecf180f64df492a3bd907697cb0778e60031ed8a

commit | commitdiff | tree

The Android Automerger [Mon, 13 Dec 2010 15:53:47 +0000 (07:53 -0800)]

HRH74

Change-Id: Ie97e0399c22273bb1e7dd32103c466f269b1dc86

commit | commitdiff | tree

The Android Automerger [Mon, 13 Dec 2010 15:53:37 +0000 (07:53 -0800)]

Merge branch 'master' into honeycomb-release

commit | commitdiff | tree

David 'Digit' Turner [Fri, 10 Dec 2010 21:24:06 +0000 (22:24 +0100)]

Add support for custom Linux host toolchains when building the SDK.

This is needed in order to build Linux SDK binaries that can run
properly on Ubuntu 8.04 (Hardy). By default, the host toolchain
on 10.04 (Lucid) generates machine code that won't run on Hardy
due to GLibc ABI mistmatches.

Note that nothing happens if the new toolchain is not in the
prebuilt tree.

Change-Id: I45c1f68e37e15a0032f885df1c5c0f297b3d8642

commit | commitdiff | tree

Ying Wang [Sat, 11 Dec 2010 00:26:59 +0000 (16:26 -0800)]

am 1f22360f: am c7973678: Merge "Default uninstallable modules\' tag to optional" into gingerbread

* commit '1f22360f60455ff9a486a6c757d1b974341c1895':
Default uninstallable modules' tag to optional

commit | commitdiff | tree

Ying Wang [Sat, 11 Dec 2010 00:21:43 +0000 (16:21 -0800)]

am c7973678: Merge "Default uninstallable modules\' tag to optional" into gingerbread

* commit 'c79736785716d56768998d64317ff90a62073868':
Default uninstallable modules' tag to optional

commit | commitdiff | tree

Ying Wang [Sat, 11 Dec 2010 00:17:59 +0000 (16:17 -0800)]

Merge "Default uninstallable modules' tag to optional" into gingerbread

commit | commitdiff | tree

android-merger [Fri, 10 Dec 2010 22:33:42 +0000 (14:33 -0800)]

HRH71B

Change-Id: I8416470b1f9d311606e64bc05f90474045bf2a8f

commit | commitdiff | tree

The Android Automerger [Fri, 10 Dec 2010 20:02:53 +0000 (12:02 -0800)]

HRH71

Change-Id: I1254b41ab0f61fdc4c98de5cd90efbe310ae6953

commit | commitdiff | tree

The Android Automerger [Fri, 10 Dec 2010 20:02:08 +0000 (12:02 -0800)]

Merge branch 'master' into honeycomb-release

commit | commitdiff | tree

Ying Wang [Fri, 10 Dec 2010 19:17:28 +0000 (11:17 -0800)]

Default uninstallable modules' tag to optional

Change-Id: I31faee42c807b3b6d7b85feea6c74860c89d45de

commit | commitdiff | tree

Jean-Baptiste Queru [Fri, 10 Dec 2010 17:01:05 +0000 (09:01 -0800)]

am 2145c46a: am 2562a40e: reconcile with open-source gingerbread

* commit '2145c46aa288c862ac3dce50877d16c0537bcea3':

commit | commitdiff | tree

Jean-Baptiste Queru [Fri, 10 Dec 2010 16:59:14 +0000 (08:59 -0800)]

am 89aa0ebf: (-s ours) Ignore 0c3d5d95 from gingerbread

* commit '89aa0ebfb86d15672ab297264ee3bf9fd3e18ea1':
2.3.1

commit | commitdiff | tree

Jean-Baptiste Queru [Fri, 10 Dec 2010 16:58:22 +0000 (08:58 -0800)]

am 2562a40e: reconcile with open-source gingerbread

* commit '2562a40eb1afa88e8e3b97fb4c96f2241d28ec1e':

commit | commitdiff | tree

Jean-Baptiste Queru [Fri, 10 Dec 2010 16:55:53 +0000 (08:55 -0800)]

Ignore 0c3d5d95 from gingerbread

Version number changes don't merge across codelines

Change-Id: I97e65e0ced9158da86568a32dc08f133755b9267

commit | commitdiff | tree

Jean-Baptiste Queru [Fri, 10 Dec 2010 16:12:51 +0000 (08:12 -0800)]

am 04eaeae3: am f724dbf7: Merge from gingerbread

* commit '04eaeae3108774671e4f8aac8592353ea79c24ad':
2.3.1

commit | commitdiff | tree

Jean-Baptiste Queru [Fri, 10 Dec 2010 16:05:23 +0000 (08:05 -0800)]

am f724dbf7: Merge from gingerbread

* commit 'f724dbf7cb697f947d761afc34b23971278452a8':
2.3.1

commit | commitdiff | tree

Jean-Baptiste Queru [Fri, 10 Dec 2010 16:01:07 +0000 (08:01 -0800)]

Merge from gingerbread

Change-Id: Icfc2bb041b1360a8a0258d7de5547fded86bf7ec

commit | commitdiff | tree

Jean-Baptiste Queru [Fri, 10 Dec 2010 15:46:16 +0000 (07:46 -0800)]

reconcile with open-source gingerbread

Change-Id: I817f61141bf2c5189b13965ea9f3ead8f19d61cb

commit | commitdiff | tree

android-merger [Thu, 9 Dec 2010 18:50:19 +0000 (10:50 -0800)]

2.3.1

Change-Id: I9096a5b7a8e85274cac23d88635d3f49e6698cd8

commit | commitdiff | tree

android-merger [Thu, 9 Dec 2010 18:50:19 +0000 (10:50 -0800)]

2.3.1

Change-Id: I64c7f35bb6cdfdfef01ce396798a0235642c0486

commit | commitdiff | tree

The Android Automerger [Thu, 9 Dec 2010 15:22:11 +0000 (07:22 -0800)]

HRH70

Change-Id: Iec2e3d1b827a08a4c40486b87fdb4c1c7a3bbb75

commit | commitdiff | tree

Ying Wang [Thu, 9 Dec 2010 04:07:48 +0000 (20:07 -0800)]

Change phony target name dist_libraries to dist_files.

Any module that does not build in apps_only build should not dist for the
default goal "droid" -- they sould dist for "dist_files" instead.

Change-Id: I8696f1ea803fbd8554ec03352e0ef369f5d7be0d

commit | commitdiff | tree

android-merger [Wed, 8 Dec 2010 21:46:44 +0000 (13:46 -0800)]

HRH69B

Change-Id: Ib10e48ba2c4ff04e4059cd1867944ebb56b387d1

commit | commitdiff | tree

The Android Automerger [Wed, 8 Dec 2010 15:22:03 +0000 (07:22 -0800)]

HRH69

Change-Id: I00eb8e0add125e8c992708f8af15ea4f0f76d3ac

commit | commitdiff | tree

The Android Automerger [Tue, 7 Dec 2010 15:21:16 +0000 (07:21 -0800)]

HRH68

Change-Id: I6f27f63e4b860b1a561904cfe01a35b907963d87

commit | commitdiff | tree

The Android Automerger [Tue, 7 Dec 2010 15:20:46 +0000 (07:20 -0800)]

Merge branch 'master' into honeycomb-release

commit | commitdiff | tree

android-merger [Tue, 7 Dec 2010 00:56:50 +0000 (16:56 -0800)]

HRH67B

Change-Id: If02d381aeeebe0a05ed95ea8bdae3c94c18409a8

commit | commitdiff | tree

Jean-Baptiste Queru [Tue, 7 Dec 2010 00:45:01 +0000 (16:45 -0800)]

am dbd43691: am 3ef1d674: am 4985f06f: Merge "Make image-size-from-data-size not use hard coded values."

* commit 'dbd43691870fa64d1ad79371e3d796ed8e63b3b9':
Make image-size-from-data-size not use hard coded values.

commit | commitdiff | tree

Scott Main [Tue, 7 Dec 2010 00:36:53 +0000 (16:36 -0800)]

resolved conflicts for merge of 1c4fe5aa to master

Change-Id: I3c83852dfb6a80614aad145d12cd61b65829805f

commit | commitdiff | tree

Jean-Baptiste Queru [Mon, 6 Dec 2010 23:12:02 +0000 (15:12 -0800)]

am 3ef1d674: am 4985f06f: Merge "Make image-size-from-data-size not use hard coded values."

* commit '3ef1d674806734c2e237a54815ea5c077ce8c344':
Make image-size-from-data-size not use hard coded values.

commit | commitdiff | tree

Jean-Baptiste Queru [Mon, 6 Dec 2010 23:10:35 +0000 (15:10 -0800)]

am 4985f06f: Merge "Make image-size-from-data-size not use hard coded values."

* commit '4985f06f4e96351c77b88b20bc9ded65daefcd3e':
Make image-size-from-data-size not use hard coded values.

commit | commitdiff | tree

Jean-Baptiste Queru [Mon, 6 Dec 2010 22:58:08 +0000 (14:58 -0800)]

Merge "Make image-size-from-data-size not use hard coded values."

commit | commitdiff | tree

Brian Muramatsu [Mon, 6 Dec 2010 20:49:13 +0000 (12:49 -0800)]

Change from @ to $(hide) in CTS Build

Change-Id: Ibda485105f750e971260088785904ea420cbaa03

commit | commitdiff | tree

The Android Automerger [Mon, 6 Dec 2010 15:27:17 +0000 (07:27 -0800)]

HRH67

Change-Id: I136e9e6992d18be19c4f244df567fef2a78790b3

commit | commitdiff | tree

The Android Automerger [Mon, 6 Dec 2010 15:26:58 +0000 (07:26 -0800)]

Merge branch 'master' into honeycomb-release

commit | commitdiff | tree

Lars Svensson [Mon, 6 Dec 2010 14:24:58 +0000 (15:24 +0100)]

Make image-size-from-data-size not use hard coded values.

The function image-size-from-data-size was using hard
coded values. The size of spare area and pages has become
configurable so we need to read from the variables.

Change-Id: I9461d34400ffc2cc5920860d8aa78750d559e397

commit | commitdiff | tree

Scott Main [Mon, 6 Dec 2010 03:04:18 +0000 (19:04 -0800)]

am dad569b4: docs: fix link

* commit 'dad569b4e815dee7056ff4d2e593ddadc3e087e1':
docs: fix link

commit | commitdiff | tree

Scott Main [Mon, 6 Dec 2010 02:03:23 +0000 (18:03 -0800)]

docs: fix link

Change-Id: Id57ebbd12c16ef914ebe1d90260fdf8a5ae4587b

commit | commitdiff | tree

Sriram Raman [Sun, 5 Dec 2010 02:15:28 +0000 (21:15 -0500)]

HRH64c

Change-Id: I1f0fa42e177e6e47032043c2eaf99478cec76829

commit | commitdiff | tree

Sriram Raman [Sat, 4 Dec 2010 23:18:21 +0000 (18:18 -0500)]

HRH64B

Change-Id: If7b2f9d033cbf10ee6cfafa9ca2b160fec981a47

commit | commitdiff | tree

android-merger [Sat, 4 Dec 2010 00:07:25 +0000 (16:07 -0800)]

HRH64

Change-Id: Ib717f8e1f11a82039d50d20f378c8f7c7a581bcb

commit | commitdiff | tree

Kenny Root [Fri, 3 Dec 2010 18:59:57 +0000 (10:59 -0800)]

Add installd to PRODUCT_PACKAGES

Another change adds the "optional" tag to installd, so moving it here
and removing it from the grandfathered list.

Change-Id: I035ffd527d007cf104c15890509976fc9b99d216

commit | commitdiff | tree

android-build SharedAccount [Thu, 2 Dec 2010 22:49:08 +0000 (14:49 -0800)]

HRH63B

Change-Id: Ia9336baef4cf44814c82d12233b8c30b9c11bb11

commit | commitdiff | tree

The Android Automerger [Thu, 2 Dec 2010 15:55:25 +0000 (07:55 -0800)]

HRH63

Change-Id: I3c7b1678c30ac86d5f1df93290cbb00f11b1d361

commit | commitdiff | tree

android-build SharedAccount [Thu, 2 Dec 2010 02:05:41 +0000 (18:05 -0800)]

HRH62C

Change-Id: I56b534e7a0d6c5e998d5514e36c96b7ed4b881a6

commit | commitdiff | tree

Ed Heyl [Thu, 2 Dec 2010 01:37:12 +0000 (17:37 -0800)]

HRH62B

Change-Id: I3d2aa54ba19ceea9e1ff578dcc552a08ea100b34

commit | commitdiff | tree

The Android Automerger [Wed, 1 Dec 2010 15:22:14 +0000 (07:22 -0800)]

HRH62

Change-Id: I14b6720c5f6e5887b4182428cad6232dce507a66

commit | commitdiff | tree

The Android Automerger [Wed, 1 Dec 2010 15:21:59 +0000 (07:21 -0800)]

Merge branch 'master' into honeycomb-release

commit | commitdiff | tree

Sriram Raman [Tue, 30 Nov 2010 20:09:19 +0000 (15:09 -0500)]

resolved conflicts for merge of 064a4562 to master

Change-Id: I795e2b6ba842541fc941c1da396734198a12ea72

commit | commitdiff | tree

Sriram Raman [Tue, 30 Nov 2010 19:45:14 +0000 (11:45 -0800)]

am c647aeca: Add mkuserimg.sh, make_ext4fs to otatools

* commit 'c647aecabb9cf03d73cfc34836e3bfc886b54c2e':
Add mkuserimg.sh, make_ext4fs to otatools

commit | commitdiff | tree

The Android Automerger [Tue, 30 Nov 2010 15:22:53 +0000 (07:22 -0800)]

HRH61

Change-Id: Ied7776007ea0e8762a2700e9605271250bf04e9c

commit | commitdiff | tree

The Android Automerger [Tue, 30 Nov 2010 15:22:41 +0000 (07:22 -0800)]

Merge branch 'master' into honeycomb-release

commit | commitdiff | tree

Sriram Raman [Mon, 29 Nov 2010 23:51:20 +0000 (18:51 -0500)]

Add mkuserimg.sh, make_ext4fs to otatools

Change-Id: Id48d6643f4579d695685fe2595bd86a80a5083c3

commit | commitdiff | tree

Scott Main [Mon, 29 Nov 2010 23:37:31 +0000 (15:37 -0800)]

Merge "docs: revisions to the sdk doc template for preview sdk, remove ndk download table for offline docs"