5956db9394
am 6b340ad0: am 7c945d24: Merge "Make error a warning for now"
...
* commit '6b340ad06c90ad80894bce720075e05f31b8f4cb':
Make error a warning for now
2012-08-17 00:47:42 -07:00
6b340ad06c
am 7c945d24: Merge "Make error a warning for now"
...
* commit '7c945d249956ed3943585b8d417a51a598b175b3':
Make error a warning for now
2012-08-17 00:46:36 -07:00
7c945d2499
Merge "Make error a warning for now"
2012-08-17 00:36:44 -07:00
aa816333ae
Make error a warning for now
...
Change-Id: Idf18957fff2bb4ff31ca6d7d8d1c8d95847b4e00
2012-08-17 00:36:00 -07:00
cea08a5220
resolved conflicts for merge of 5836d3b3 to jb-mr1-dev
...
Change-Id: If3d84a7439717ccf7723b3f79e934d73abbb3fea
2012-08-17 00:09:27 -07:00
5836d3b3d9
am f72e34eb: Merge changes I9d3a3c16,I17b5d441,I29e27505,Ia5ca233e,I0a0b200b,I6f412ed4,I623821df,Ifec8e63e,I12d0a847,Idac551e5,I59a88027,I2498139d,I6bd93a87
...
* commit 'f72e34ebf49ed2a06fe9e37d134f2088e2c0c0e4':
Move the old user tagged modules over to base.mk so mini and core both share them.
More product debugging.
build system changes for jb-aah-dev merge
Fail when a non-vendor product references a vendor module.
Remove support for user tags in the build system.
List the user modules explicitly, and we can get rid of the support for the user tag!
Dump the user tagged modules.
host modules don't need LOCAL_MODULE_TAGS
Don't give the user tag to host modules automatically.
Add a phony "nothing" goal that reads the makefiles but doesn't try to build anything.
Add tool to parse make dependency info from new --deps flag.
Use a more modern -j flag.
make product-graph now filtered
2012-08-16 23:50:34 -07:00
f72e34ebf4
Merge changes I9d3a3c16,I17b5d441,I29e27505,Ia5ca233e,I0a0b200b,I6f412ed4,I623821df,Ifec8e63e,I12d0a847,Idac551e5,I59a88027,I2498139d,I6bd93a87
...
* changes:
Move the old user tagged modules over to base.mk so mini and core both share them.
More product debugging.
build system changes for jb-aah-dev merge
Fail when a non-vendor product references a vendor module.
Remove support for user tags in the build system.
List the user modules explicitly, and we can get rid of the support for the user tag!
Dump the user tagged modules.
host modules don't need LOCAL_MODULE_TAGS
Don't give the user tag to host modules automatically.
Add a phony "nothing" goal that reads the makefiles but doesn't try to build anything.
Add tool to parse make dependency info from new --deps flag.
Use a more modern -j flag.
make product-graph now filtered
2012-08-16 23:37:45 -07:00
22273e6cfe
Move the old user tagged modules over to base.mk so mini and core both share them.
...
Change-Id: I9d3a3c165fa56d4ca137b3c06e249e1deea6a1c5
2012-08-16 22:36:41 -07:00
f3319452ad
More product debugging.
...
Change-Id: I17b5d441e44ea39564263b32f963e2d3ac684232
2012-08-16 22:36:41 -07:00
26ead966d7
build system changes for jb-aah-dev merge
...
Change-Id: I29e27505a0d9f7cc2932f725bfe1c83d804388bc
2012-08-16 22:36:41 -07:00
75493610b3
Fail when a non-vendor product references a vendor module.
...
Change-Id: Ia5ca233e9b11f64b72074f65899d3041cf955c4c
2012-08-16 22:36:41 -07:00
529302d912
Remove support for user tags in the build system.
...
It is not forbidden to say LOCAL_MODULE_TAGS := user,
and if you don't say LOCAL_MODULE_TAGS, it now defaults
to optional.
Change-Id: I0a0b200bb6f1c7bf1fe3a89cdc8f69678617526c
2012-08-16 22:36:41 -07:00
8cfca47f5a
List the user modules explicitly, and we can get rid of the support for the user tag!
...
Change-Id: I6f412ed4e08d784ed71ec170e870fcf30081963a
2012-08-16 22:36:40 -07:00
d23c3235fa
Dump the user tagged modules.
...
Change-Id: I623821df3e48b358a6b898ccb13750f7dc54ddcf
2012-08-16 22:36:40 -07:00
b4da6b50fe
host modules don't need LOCAL_MODULE_TAGS
...
Change-Id: Ifec8e63eef512b281eb924ef92160e9e1bf97f6d
2012-08-16 22:36:40 -07:00
f85cb7c936
Don't give the user tag to host modules automatically.
...
Change-Id: I12d0a84786e5bf2224efd8684526b6097e6105d7
2012-08-16 22:36:40 -07:00
d6b1d628be
Add a phony "nothing" goal that reads the makefiles but doesn't try to build anything.
...
Change-Id: Idac551e5c796321e993b94761f5cbf5b55c1a994
2012-08-16 22:36:40 -07:00
cc788043b7
Add tool to parse make dependency info from new --deps flag.
...
Change-Id: I59a88027d88cceee9f2933c84379612698952043
2012-08-16 22:36:40 -07:00
6ea77a2dc8
Use a more modern -j flag.
...
Change-Id: I2498139dd41637a795ca43f830c952adb2856d83
2012-08-16 22:36:40 -07:00
f5debbfee6
make product-graph now filtered
...
Change-Id: I6bd93a87902e20a24c1c58152fb578ef1f4cb208
2012-08-16 22:36:40 -07:00
36bec56c30
am dfab95a1: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge
...
* commit 'dfab95a150da3014794fc92006c7f44e635ce1f6':
JRO03R
JZO47
JRO03Q
2012-08-16 18:57:26 -07:00
dfab95a150
Reconcile with jb-mr0-release jb-release - do not merge
...
Change-Id: Ie56fbb34384a4cf7d00b2ce89fd69ec434396a05
2012-08-16 18:55:59 -07:00
52ea916755
JRO03R
2012-08-16 18:22:16 -07:00
0e29ca910b
JZO47
2012-08-16 17:58:34 -07:00
e2b5b946b8
merge in jb-mr0-release history after reset to jb-dev
2012-08-16 17:57:18 -07:00
732b2ba79a
Merge "Don't include system/core/include/arch/<arch>/Android.mk for apps-only build." into jb-mr1-dev
2012-08-16 16:51:00 -07:00
da4bf42514
Don't include system/core/include/arch/<arch>/Android.mk for apps-only build.
...
Bug: 6994483
Change-Id: I76c4d96264cf94a79d59fdeb52bb37c07a9458dd
2012-08-16 16:45:01 -07:00
2f32c04d8c
am d77d8906: am 6020d698: Merge "select.mk: Tune ccache options"
...
* commit 'd77d8906b8fc4a6e2ecaf9bc5f5b84ddec6dbe7e':
select.mk: Tune ccache options
2012-08-16 15:28:47 -07:00
d77d8906b8
am 6020d698: Merge "select.mk: Tune ccache options"
...
* commit '6020d698f51132cab374e6c96f7da4902f3aa84f':
select.mk: Tune ccache options
2012-08-16 15:27:54 -07:00
8deff5cb19
JRO03Q
2012-08-16 15:21:25 -07:00
6020d698f5
Merge "select.mk: Tune ccache options"
2012-08-16 14:55:26 -07:00
1f93043c86
select.mk: Tune ccache options
...
With these adjustments, cached object files can now be shared across
multiple Android trees on a single workstation:
* Compiler binary modification time no longer causes cache misses,
as a hash of the compiler binary is taken rather than looking
at the mtime and size
* Header file modification time no longer causes cache misses,
the headers are now always hashed
* Macros such as __DATE__ and __TIME__ no longer cause cache misses
* All paths in preprocessed source (due to use of -g) are now relative
These options require ccache 3.1 or later to be used; ccache 2.4 will
ignore these.
Change-Id: I7839637e9dacf7240bd9b7bfaa6406b1db423560
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2012-08-16 11:11:29 -07:00
bc415dd5eb
Support to build emmap_mata.zip in unbundled builds.
...
Bug: 6987838
Change-Id: Id6c81b08c4859442b7d52054ed5f278575719d1a
2012-08-16 10:10:11 -07:00
a8352cac8d
am 0fc8d635: am f2a618e1: Merge "The zoneinfo stuff is no longer legacy."
...
* commit '0fc8d635a7f3712cc24f7a29d97755bc15972a0a':
The zoneinfo stuff is no longer legacy.
2012-08-15 20:03:54 -07:00
0fc8d635a7
am f2a618e1: Merge "The zoneinfo stuff is no longer legacy."
...
* commit 'f2a618e1df126c6c48622cce948825e923b52dcb':
The zoneinfo stuff is no longer legacy.
2012-08-15 20:02:49 -07:00
f2a618e1df
Merge "The zoneinfo stuff is no longer legacy."
2012-08-15 19:43:41 -07:00
e1654eaccb
The zoneinfo stuff is no longer legacy.
...
Change-Id: I7f76dfc15c0b2febbcdb13f12ff9390dca124585
2012-08-15 18:34:49 -07:00
a8811fda4f
fix MIPS build
...
- crtxx.o built under TARGET_OUT_INTERMEDIATE_LIBRARIES,
not under TARGET_OUT_STATIC_LIBRARIES
Change-Id: Ife05206bd66f691853100bbf17e08a13c287d073
2012-08-15 13:42:37 -07:00
8182182182
fix PDK boot issue
...
- add missing packages to make it boot
Change-Id: I9a4a635e67a82c326f9eb1eceb86cffc8f59a2d3
2012-08-15 11:32:23 -07:00
0016a9ba8d
Merge "build: register BOARD_HAVE_BLUETOOTH_QCOM" into jb-mr1-dev
2012-08-15 09:18:12 -07:00
0854694c51
build: register BOARD_HAVE_BLUETOOTH_QCOM
...
Change-Id: I594abd6d3b152a4e5bc48b6ac447e155c85b2fe0
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-08-15 08:12:06 -07:00
0062f811c0
am 1a0f6725: (-s ours) Reconcile with jb-release - do not merge
...
* commit '1a0f6725392279ed6b44e97b00315b8173abf454':
JRO03P
2012-08-15 08:05:37 -07:00
1a0f672539
Reconcile with jb-release - do not merge
...
Change-Id: I3ea7d0a8c3865290f404bb24b464fcfb7410dd0e
2012-08-15 08:04:29 -07:00
d3ee366af2
am 021ff2ee: am 9edfa6db: docs: move home.css into default.css to reduce number of requests
...
* commit '021ff2ee388bdb548ae55b349535d14e0423207c':
docs: move home.css into default.css to reduce number of requests
2012-08-14 18:12:02 -07:00
021ff2ee38
am 9edfa6db: docs: move home.css into default.css to reduce number of requests
...
* commit '9edfa6db8c53ef9515aaeed734bea02c5d65e1e5':
docs: move home.css into default.css to reduce number of requests
2012-08-14 18:10:52 -07:00
24cd280328
allow diff program to be selected explicitly
...
Change-Id: I1d8df9cc3ed35cc5983bc50fc13975db32072dbe
2012-08-14 16:36:15 -07:00
9edfa6db8c
docs: move home.css into default.css to reduce number of requests
...
Change-Id: I156182c5ad1545f570808af565948cbd3c05a3ee
2012-08-14 16:28:45 -07:00
8513b62f6a
Merge "Include FusedLocation.apk on sdk builds too" into jb-mr1-dev
2012-08-14 15:31:42 -07:00
9d04cc4ef2
Include FusedLocation.apk on sdk builds too
...
Bug: 6969889
Change-Id: Ifda8df58906b3e1d77de0f7de0b1dd07c6bf430f
2012-08-14 13:34:43 -07:00
27d51bf6d3
Force out LOCAL_NDK_VERSION.
...
Change-Id: I0a9f1a630ef2019bed38d420525eac9510b09798
2012-08-14 13:06:22 -07:00
Joe Onorato