Ying Wang
085ff6a8ac
am 098826bf: am 099fecd7: Use PRIVATE_CXX in HOST modules.
...
* commit '098826bf61cba2b14a0538100878bdb029f50790':
Use PRIVATE_CXX in HOST modules.
2010-12-20 11:42:35 -08:00
Ying Wang
098826bf61
am 099fecd7: Use PRIVATE_CXX in HOST modules.
...
* commit '099fecd759ce54168fe4094880d1ca748e8906b9':
Use PRIVATE_CXX in HOST modules.
2010-12-20 11:40:33 -08:00
Ying Wang
099fecd759
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
2010-12-20 11:18:28 -08:00
Jean-Baptiste Queru
fe2be8ed33
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).
2010-12-16 16:04:26 -08:00
Jean-Baptiste Queru
28599d022e
Ignore 9bfb8142
from gingerbread
...
Change-Id: Ie0ec4fc224d23516906b9ca750c5200aa7fbf63c
2010-12-16 15:43:57 -08:00
Jeff Hamilton
9bfb81426b
DO NOT MERGE: The API version changed and a bunch of stuff needs rebuilding, so just wipe $(OUT_DIR).
...
Change-Id: I7b6c291db3ec09c7b53949a04cc792912004a1de
2010-12-15 18:33:33 -06:00
Brian Carlstrom
a8d91ff6e3
Merge "Scrub the set of dalvik modules that are built by default"
2010-12-15 13:21:21 -08:00
Ying Wang
fe7ffc9134
Merge "Add framework includes for any aidl source."
2010-12-15 13:18:23 -08:00
Brian Carlstrom
bf66dd3485
Scrub the set of dalvik modules that are built by default
...
Bug: 3009435
Change-Id: I20d88df665e48aa74c20cef7e236de377cd0d14b
2010-12-14 22:35:10 -08:00
Jean-Baptiste Queru
b5c02ecbde
am 34e82671: resolved conflicts for merge of 76aa8d0a
to gingerbread-plus-aosp
...
* commit '34e826718e99d56da38ecd5ffd8873997722fa92':
update API version to 9
2010-12-14 16:26:34 -08:00
Jean-Baptiste Queru
34e826718e
resolved conflicts for merge of 76aa8d0a
to gingerbread-plus-aosp
...
Change-Id: I7fa43d5b5d52b68baca3e4848cd308fea1d1fb98
2010-12-14 16:23:36 -08:00
Jean-Baptiste Queru
76aa8d0a8b
update API version to 9
...
Change-Id: Ia573996bb910e19c8f7017ca13cf9d9d77083404
2010-12-14 16:16:44 -08:00
Jean-Baptiste Queru
282d391239
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"
2010-12-14 16:15:12 -08:00
Jean-Baptiste Queru
3463d0e102
resolved conflicts for merge of c1b33081
to gingerbread-plus-aosp - DO NOT MERGE
...
Change-Id: I785e36efe89cc11e2dacfb4a30901be93453f221
2010-12-14 16:12:23 -08:00
Dianne Hackborn
c1b330818e
(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
2010-12-14 11:30:43 -08:00
Ying Wang
1214aeb75f
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
2010-12-14 10:57:54 -08:00
David 'Digit' Turner
02e172e892
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.
2010-12-14 02:45:58 -08:00
David 'Digit' Turner
efc5d81428
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.
2010-12-14 02:42:10 -08:00
David 'Digit' Turner
15f4980d51
Merge "Add support for custom Linux host toolchains when building the SDK." into gingerbread
2010-12-14 02:37:05 -08:00
Brian Carlstrom
b531c0b44c
Merge "Unify target and host Java compilation"
2010-12-13 13:20:21 -08:00
Brian Carlstrom
782695112d
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
2010-12-13 11:29:58 -08:00
Daniel Sandler
87c983ca57
Protips: End of line.
...
Bug: 3248626
Change-Id: Iecf180f64df492a3bd907697cb0778e60031ed8a
2010-12-13 12:46:17 -05:00
David 'Digit' Turner
0960ca7488
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
2010-12-13 11:52:03 +01:00
Ying Wang
953b64f48a
am 1f22360f: am c7973678: Merge "Default uninstallable modules\' tag to optional" into gingerbread
...
* commit '1f22360f60455ff9a486a6c757d1b974341c1895':
Default uninstallable modules' tag to optional
2010-12-10 16:26:59 -08:00
Ying Wang
1f22360f60
am c7973678: Merge "Default uninstallable modules\' tag to optional" into gingerbread
...
* commit 'c79736785716d56768998d64317ff90a62073868':
Default uninstallable modules' tag to optional
2010-12-10 16:21:43 -08:00
Ying Wang
c797367857
Merge "Default uninstallable modules' tag to optional" into gingerbread
2010-12-10 16:17:59 -08:00
Ying Wang
2fd81cf11e
Default uninstallable modules' tag to optional
...
Change-Id: I31faee42c807b3b6d7b85feea6c74860c89d45de
2010-12-10 11:17:28 -08:00
Jean-Baptiste Queru
432b3a350a
am 2145c46a: am 2562a40e: reconcile with open-source gingerbread
...
* commit '2145c46aa288c862ac3dce50877d16c0537bcea3':
2010-12-10 09:01:05 -08:00
Jean-Baptiste Queru
2276819b42
am 89aa0ebf: (-s ours) Ignore 0c3d5d95
from gingerbread
...
* commit '89aa0ebfb86d15672ab297264ee3bf9fd3e18ea1':
2.3.1
2010-12-10 08:59:14 -08:00
Jean-Baptiste Queru
2145c46aa2
am 2562a40e: reconcile with open-source gingerbread
...
* commit '2562a40eb1afa88e8e3b97fb4c96f2241d28ec1e':
2010-12-10 08:58:22 -08:00
Jean-Baptiste Queru
89aa0ebfb8
Ignore 0c3d5d95
from gingerbread
...
Version number changes don't merge across codelines
Change-Id: I97e65e0ced9158da86568a32dc08f133755b9267
2010-12-10 08:56:22 -08:00
Jean-Baptiste Queru
486404896a
am 04eaeae3: am f724dbf7: Merge from gingerbread
...
* commit '04eaeae3108774671e4f8aac8592353ea79c24ad':
2.3.1
2010-12-10 08:12:51 -08:00
Jean-Baptiste Queru
04eaeae310
am f724dbf7: Merge from gingerbread
...
* commit 'f724dbf7cb697f947d761afc34b23971278452a8':
2.3.1
2010-12-10 08:05:23 -08:00
Jean-Baptiste Queru
f724dbf7cb
Merge from gingerbread
...
Change-Id: Icfc2bb041b1360a8a0258d7de5547fded86bf7ec
2010-12-10 08:01:07 -08:00
Jean-Baptiste Queru
2562a40eb1
reconcile with open-source gingerbread
...
Change-Id: I817f61141bf2c5189b13965ea9f3ead8f19d61cb
2010-12-10 07:46:16 -08:00
android-merger
1840de544b
2.3.1
...
Change-Id: I9096a5b7a8e85274cac23d88635d3f49e6698cd8
2010-12-10 07:42:24 -08:00
android-merger
0c3d5d9541
2.3.1
...
Change-Id: I64c7f35bb6cdfdfef01ce396798a0235642c0486
2010-12-09 16:11:38 -08:00
Ying Wang
228fcef025
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
2010-12-08 20:07:48 -08:00
Jean-Baptiste Queru
1ee80eefc7
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.
2010-12-06 16:45:01 -08:00
Scott Main
6ea057563d
resolved conflicts for merge of 1c4fe5aa
to master
...
Change-Id: I3c83852dfb6a80614aad145d12cd61b65829805f
2010-12-06 16:36:53 -08:00
Jean-Baptiste Queru
dbd4369187
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.
2010-12-06 15:12:02 -08:00
Jean-Baptiste Queru
3ef1d67480
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.
2010-12-06 15:10:35 -08:00
Jean-Baptiste Queru
4985f06f4e
Merge "Make image-size-from-data-size not use hard coded values."
2010-12-06 14:58:08 -08:00
Brian Muramatsu
1cf9e0ef16
Change from @ to $(hide) in CTS Build
...
Change-Id: Ibda485105f750e971260088785904ea420cbaa03
2010-12-06 12:49:13 -08:00
Lars Svensson
9cb8c28352
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
2010-12-06 16:18:46 +01:00
Scott Main
1c4fe5aaff
am dad569b4: docs: fix link
...
* commit 'dad569b4e815dee7056ff4d2e593ddadc3e087e1':
docs: fix link
2010-12-05 19:04:18 -08:00
Scott Main
dad569b4e8
docs: fix link
...
Change-Id: Id57ebbd12c16ef914ebe1d90260fdf8a5ae4587b
2010-12-05 18:03:23 -08:00
Kenny Root
696180ecda
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
2010-12-03 11:00:40 -08:00
Sriram Raman
ff83c8593e
resolved conflicts for merge of 064a4562
to master
...
Change-Id: I795e2b6ba842541fc941c1da396734198a12ea72
2010-11-30 15:09:19 -05:00
Sriram Raman
064a4562a4
am c647aeca: Add mkuserimg.sh, make_ext4fs to otatools
...
* commit 'c647aecabb9cf03d73cfc34836e3bfc886b54c2e':
Add mkuserimg.sh, make_ext4fs to otatools
2010-11-30 11:45:14 -08:00