Jean-Baptiste Queru
dbf6ad0692
am 713bac96
: Merge "ARM: put crtbegin_so.o at the beginning where it belongs"
...
* commit '713bac96d628d6ca040fb1fe5d7a8abdcb932553':
ARM: put crtbegin_so.o at the beginning where it belongs
2012-08-24 13:04:48 -07:00
Jean-Baptiste Queru
713bac96d6
Merge "ARM: put crtbegin_so.o at the beginning where it belongs"
2012-08-24 13:00:10 -07:00
The Android Automerger
0bd5415fa0
JZO54
2012-08-23 21:31:01 -07:00
The Android Automerger
59492596c9
merge in jb-mr0-release history after reset to jb-dev
2012-08-23 21:30:08 -07:00
Jean-Baptiste Queru
83af736f28
am 5ac65f86
: Merge "Fix reporting wrong error message for zipalign output file"
...
* commit '5ac65f869601df5e73fb84b67e57af8ef95cc3bf':
Fix reporting wrong error message for zipalign output file
2012-08-23 15:09:15 -07:00
Jean-Baptiste Queru
5ac65f8696
Merge "Fix reporting wrong error message for zipalign output file"
2012-08-23 14:52:41 -07:00
Jean-Baptiste Queru
e3479ea503
am 15012c11
: Merge "Build on Mac OS X : add experimental SDK versions"
...
* commit '15012c115dca7bc0d2edd8dd2689117546b1360e':
Build on Mac OS X : add experimental SDK versions
2012-08-22 09:55:25 -07:00
Jean-Baptiste Queru
15012c115d
Merge "Build on Mac OS X : add experimental SDK versions"
2012-08-22 09:44:48 -07:00
The Android Open Source Project
9c6df3cdcc
Reconcile with jb-release - do not merge
...
Change-Id: I89dbc5ee1f1765f334f5dd5d1feb7c05a7d9360f
2012-08-21 16:12:25 -07:00
The Android Automerger
f649352b3f
JRO03S
2012-08-21 15:34:59 -07:00
Andrew Hsieh
cd3050c541
am 4d69e06b
: Merge "Added BUILD_HOST_static to build statically linked executable/shared-lib"
...
* commit '4d69e06b764d030dcc3ce9bc8b103a75eff3175a':
Added BUILD_HOST_static to build statically linked executable/shared-lib
2012-08-21 12:58:45 -07:00
SangWook Han
691e0243ca
Build on Mac OS X : add experimental SDK versions
...
Change-Id: Ifc67d1745e72fc048cd6e8c8ef0521ab92468086
2012-08-22 02:59:58 +09:00
Andrew Hsieh
4d69e06b76
Merge "Added BUILD_HOST_static to build statically linked executable/shared-lib"
2012-08-21 10:21:55 -07:00
Ard Biesheuvel
6c1f9ccfb1
ARM: put crtbegin_so.o at the beginning where it belongs
...
Change-Id: I9466fe9277c58a7b8f8a9964b2d578a65e579995
2012-08-21 10:42:32 +02:00
Andrew Hsieh
31ef1037bf
Added BUILD_HOST_static to build statically linked executable/shared-lib
...
Statically linked executable/shared-lib (eg. SDK tools) are useful
in sandboxed environment.
In BUILD_HOST_static zipalign needs -lpthread indirectly:
zipalign->libutils.a->liblog.a->logd_write.c->pthread
Change-Id: I615f574e918c83ed1ab82db2453b69d0420cb59c
2012-08-21 14:40:16 +08:00
Scott Main
50187e5345
am f5089846
: docs: combine all possible js files into one to reduce the number of requests Also make change to doc template and css to fix footer layout bug introduced by change 9edfa6db8c
...
* commit 'f5089846a1876f8e976d4bd1ddf383d3ed68d558':
docs: combine all possible js files into one to reduce the number of requests Also make change to doc template and css to fix footer layout bug introduced by change 9edfa6db8c
2012-08-20 17:01:19 -07:00
Jingwen Owen Ou
303213915d
Fix reporting wrong error message for zipalign output file
...
The problem is due to using variable inFileName instead of outFileName for printing out error message for output file.
Change-Id: Ie53a21b077fea5e7cd106fe6884cea159d2629a2
2012-08-17 16:21:11 -07:00
Joe Onorato
726d921a47
am 45cd00cd
: Merge "Install all host modules. Don\'t filter out ones tagged "optional""
...
* commit '45cd00cd9e2feec187a6253b95e866cd10dfa20a':
Install all host modules. Don't filter out ones tagged "optional"
2012-08-17 05:43:43 -07:00
Joe Onorato
45cd00cd9e
Merge "Install all host modules. Don't filter out ones tagged "optional""
2012-08-17 05:36:21 -07:00
Joe Onorato
68559da02f
Install all host modules. Don't filter out ones tagged "optional"
...
Change-Id: I9b3a27a4c84ee748314e98603670eb939ae949e2
2012-08-17 05:35:23 -07:00
Joe Onorato
763c080198
am 687bde38
: Merge "Add all the host tools to the list of prerequisites for the SDK."
...
* commit '687bde38891b6aa3796f52721d7498436ab45330':
Add all the host tools to the list of prerequisites for the SDK.
2012-08-17 04:34:06 -07:00
Joe Onorato
687bde3889
Merge "Add all the host tools to the list of prerequisites for the SDK."
2012-08-17 04:20:37 -07:00
Joe Onorato
63d56dad65
Add all the host tools to the list of prerequisites for the SDK.
...
Change-Id: I3a3e4be8796f761119e29f3be64ad534e48c95ee
2012-08-17 04:19:38 -07:00
Joe Onorato
fab83a3d62
am 3b4b11a4
: Merge "Another error to warning"
...
* commit '3b4b11a4701b64df5248e7d86c0c357954a2ca10':
Another error to warning
2012-08-17 01:22:31 -07:00
Joe Onorato
3b4b11a470
Merge "Another error to warning"
2012-08-17 01:13:00 -07:00
Joe Onorato
0ee86a7429
Another error to warning
...
Change-Id: Ifbad63e3eb37d087d88a39e102b4239f305d0ee3
2012-08-17 01:12:27 -07:00
Joe Onorato
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
Joe Onorato
7c945d2499
Merge "Make error a warning for now"
2012-08-17 00:36:44 -07:00
Joe Onorato
aa816333ae
Make error a warning for now
...
Change-Id: Idf18957fff2bb4ff31ca6d7d8d1c8d95847b4e00
2012-08-17 00:36:00 -07:00
Joe Onorato
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
Joe Onorato
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
Joe Onorato
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
Joe Onorato
f3319452ad
More product debugging.
...
Change-Id: I17b5d441e44ea39564263b32f963e2d3ac684232
2012-08-16 22:36:41 -07:00
Joe Onorato
26ead966d7
build system changes for jb-aah-dev merge
...
Change-Id: I29e27505a0d9f7cc2932f725bfe1c83d804388bc
2012-08-16 22:36:41 -07:00
Joe Onorato
75493610b3
Fail when a non-vendor product references a vendor module.
...
Change-Id: Ia5ca233e9b11f64b72074f65899d3041cf955c4c
2012-08-16 22:36:41 -07:00
Joe Onorato
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
Joe Onorato
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
Joe Onorato
d23c3235fa
Dump the user tagged modules.
...
Change-Id: I623821df3e48b358a6b898ccb13750f7dc54ddcf
2012-08-16 22:36:40 -07:00
Joe Onorato
b4da6b50fe
host modules don't need LOCAL_MODULE_TAGS
...
Change-Id: Ifec8e63eef512b281eb924ef92160e9e1bf97f6d
2012-08-16 22:36:40 -07:00
Joe Onorato
f85cb7c936
Don't give the user tag to host modules automatically.
...
Change-Id: I12d0a84786e5bf2224efd8684526b6097e6105d7
2012-08-16 22:36:40 -07:00
Joe Onorato
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
Joe Onorato
cc788043b7
Add tool to parse make dependency info from new --deps flag.
...
Change-Id: I59a88027d88cceee9f2933c84379612698952043
2012-08-16 22:36:40 -07:00
Joe Onorato
6ea77a2dc8
Use a more modern -j flag.
...
Change-Id: I2498139dd41637a795ca43f830c952adb2856d83
2012-08-16 22:36:40 -07:00
Joe Onorato
f5debbfee6
make product-graph now filtered
...
Change-Id: I6bd93a87902e20a24c1c58152fb578ef1f4cb208
2012-08-16 22:36:40 -07:00
The Android Open Source Project
dfab95a150
Reconcile with jb-mr0-release jb-release - do not merge
...
Change-Id: Ie56fbb34384a4cf7d00b2ce89fd69ec434396a05
2012-08-16 18:55:59 -07:00
The Android Automerger
52ea916755
JRO03R
2012-08-16 18:22:16 -07:00
The Android Automerger
0e29ca910b
JZO47
2012-08-16 17:58:34 -07:00
The Android Automerger
e2b5b946b8
merge in jb-mr0-release history after reset to jb-dev
2012-08-16 17:57:18 -07:00
Jean-Baptiste Queru
d77d8906b8
am 6020d698
: Merge "select.mk: Tune ccache options"
...
* commit '6020d698f51132cab374e6c96f7da4902f3aa84f':
select.mk: Tune ccache options
2012-08-16 15:27:54 -07:00
The Android Automerger
8deff5cb19
JRO03Q
2012-08-16 15:21:25 -07:00