f3b8659105
Merge "Allow full_x86 and full_mips in unbundled build." into jb-mr1-dev
2012-08-22 10:10:09 -07:00
0d9827386d
Allow full_x86 and full_mips in unbundled build.
...
So we can do unbundled builds for x86 and mips devices.
Change-Id: Ibd8c3b0371c316b713a748a6e6ce14fe98fdc4aa
2012-08-22 10:09:22 -07:00
cd9668edd4
am e3479ea5: am 15012c11: Merge "Build on Mac OS X : add experimental SDK versions"
...
* commit 'e3479ea5033e2ede36f6f771dd3a6ea315505efd':
Build on Mac OS X : add experimental SDK versions
2012-08-22 09:57:30 -07:00
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
15012c115d
Merge "Build on Mac OS X : add experimental SDK versions"
2012-08-22 09:44:48 -07:00
4606449a53
am 9c6df3cd: (-s ours) Reconcile with jb-release - do not merge
...
* commit '9c6df3cdcc938302ba3176f56ec9b19c2d226227':
JRO03S
2012-08-21 16:13:22 -07:00
9c6df3cdcc
Reconcile with jb-release - do not merge
...
Change-Id: I89dbc5ee1f1765f334f5dd5d1feb7c05a7d9360f
2012-08-21 16:12:25 -07:00
f649352b3f
JRO03S
2012-08-21 15:34:59 -07:00
b3f83098ef
Merge "android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES." into jb-mr1-dev
2012-08-21 13:45:38 -07:00
e1085e9b9d
am cd3050c5: am 4d69e06b: Merge "Added BUILD_HOST_static to build statically linked executable/shared-lib"
...
* commit 'cd3050c541f665ee4b8462d1ccdabfe1ed2dbf4a':
Added BUILD_HOST_static to build statically linked executable/shared-lib
2012-08-21 13:01:05 -07:00
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
02d75da447
android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES.
...
Bug: 7019588
Change-Id: I6406110071d891e27df6d1cc562a7baa884b2e9e
2012-08-21 11:54:49 -07:00
10c2ef5caf
Merge "change target to androideabi" into jb-mr1-dev
2012-08-21 11:22:46 -07:00
691e0243ca
Build on Mac OS X : add experimental SDK versions
...
Change-Id: Ifc67d1745e72fc048cd6e8c8ef0521ab92468086
2012-08-22 02:59:58 +09:00
b32161a2a5
change recovery partition construction to use resource .dat
...
When /system/etc/recovery-resource.dat is available, use it to
construct the recovery-from-boot patch.
Change-Id: I1575f7d284711323186ca6823842eb2a866fd890
2012-08-21 10:33:44 -07:00
4d69e06b76
Merge "Added BUILD_HOST_static to build statically linked executable/shared-lib"
2012-08-21 10:21:55 -07:00
02a2f848b6
change target to androideabi
...
- it should be androideabi instead of android
external/llvm/lib/Support/Triple.cpp
Change-Id: Ied50f2dba930b402d000b5eb3b3ce5ef20731b8b
2012-08-21 10:20:18 -07:00
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
ffa66a1a65
Merge "replace apps for PDK" into jb-mr1-dev
2012-08-20 17:25:52 -07:00
14b61dac86
replace apps for PDK
...
- Launcher2 to Home
- SystemUI to DummySystemUI
- Settings to DummySettings
Change-Id: Ibeecf3d4df0dbb38737dba7503819d2b700036c1
2012-08-20 17:06:36 -07:00
1e44894605
am 50187e53: 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 '50187e53450fba54131e5d5857e5f05cb6b0e849':
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:02:56 -07:00
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
85e86626e9
Merge "include recovery-resource.dat in /system/etc" into jb-mr1-dev
2012-08-20 15:47:07 -07:00
565888726b
include recovery-resource.dat in /system/etc
...
Put the recovery UI images into a file in /system/etc where we can use
them for constructing the recovery image, so they don't need to be
included in OTA packages.
Change-Id: Iab2144865298c8967eb31660abd3bb11e6ec26fa
2012-08-20 15:38:58 -07:00
397d2edbb9
Merge "add CLANG configurations for MIPS" into jb-mr1-dev
2012-08-20 09:36:11 -07:00
9b36dd279a
Merge "Skip the top out directory in mgrep." into jb-mr1-dev
2012-08-17 15:04:38 -07:00
324c2b2073
Skip the top out directory in mgrep.
...
Change-Id: I0530b24179034f521dc2366588cdc906ef466750
2012-08-17 15:04:10 -07:00
6937a44742
Merge "load SYSTEM/build.prop into the info_dict" into jb-mr1-dev
2012-08-17 13:15:28 -07:00
5ad1d7ec00
am 726d921a: am 45cd00cd: Merge "Install all host modules. Don\'t filter out ones tagged "optional""
...
* commit '726d921a47cb1003bcf7ff84ae1d332dec86d674':
Install all host modules. Don't filter out ones tagged "optional"
2012-08-17 05:46:29 -07:00
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
45cd00cd9e
Merge "Install all host modules. Don't filter out ones tagged "optional""
2012-08-17 05:36:21 -07:00
68559da02f
Install all host modules. Don't filter out ones tagged "optional"
...
Change-Id: I9b3a27a4c84ee748314e98603670eb939ae949e2
2012-08-17 05:35:23 -07:00
b68c3f9ca5
am 763c0801: am 687bde38: Merge "Add all the host tools to the list of prerequisites for the SDK."
...
* commit '763c080198655782cc5700d6f53cce330ab7e008':
Add all the host tools to the list of prerequisites for the SDK.
2012-08-17 05:08:36 -07:00
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
687bde3889
Merge "Add all the host tools to the list of prerequisites for the SDK."
2012-08-17 04:20:37 -07:00
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
c5fbef5413
resolved conflicts for merge of fab83a3d to jb-mr1-dev
...
Change-Id: I97aff2be317fd10b68d933e65259ec48bd5ff6a1
2012-08-17 01:26:41 -07:00
fab83a3d62
am 3b4b11a4: Merge "Another error to warning"
...
* commit '3b4b11a4701b64df5248e7d86c0c357954a2ca10':
Another error to warning
2012-08-17 01:22:31 -07:00
3b4b11a470
Merge "Another error to warning"
2012-08-17 01:13:00 -07:00
0ee86a7429
Another error to warning
...
Change-Id: Ifbad63e3eb37d087d88a39e102b4239f305d0ee3
2012-08-17 01:12:27 -07:00
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
Ying Wang