OSDN Git Service

android-x86/build.git
10 years agoam 62eb51af: Keep Parcelable CREATOR fields
Scott Kennedy [Mon, 7 Apr 2014 19:02:54 +0000 (19:02 +0000)]
am 62eb51af: Keep Parcelable CREATOR fields

* commit '62eb51af23b5f0ac43a8f596582d469fe5e3a375':
  Keep Parcelable CREATOR fields

10 years agoKeep Parcelable CREATOR fields
Scott Kennedy [Mon, 7 Apr 2014 18:25:47 +0000 (11:25 -0700)]
Keep Parcelable CREATOR fields

Change-Id: I64451134a9d11d17307ef4d8ea923df5fe5e37ed

10 years agoam 08032409: Add basic support for rendering dynamic content on pages.
Dirk Dougherty [Wed, 2 Apr 2014 23:32:20 +0000 (23:32 +0000)]
am 08032409: Add basic support for rendering dynamic content on pages.

* commit '08032409b4dd29740e1c8e703eada0d1ce86e58c':
  Add basic support for rendering dynamic content on pages.

10 years agoAdd basic support for rendering dynamic content on pages.
Dirk Dougherty [Sat, 15 Feb 2014 18:14:35 +0000 (10:14 -0800)]
Add basic support for rendering dynamic content on pages.

Change-Id: If3ba4f71771a01043ec6d544e3b4a9222ba35daf

10 years agocortex-a7 supports div
Brian Carlstrom [Mon, 31 Mar 2014 23:58:09 +0000 (16:58 -0700)]
cortex-a7 supports div

Change-Id: Id06fe4af3a71bbb8beee4d1846f1917d87664033

10 years agoam 70c9c2d8: am a36253b8: fix viewport width variable by using underscore instead...
Scott Main [Thu, 27 Mar 2014 20:14:03 +0000 (20:14 +0000)]
am 70c9c2d8: am a36253b8: fix viewport width variable by using underscore instead of hyphen

* commit '70c9c2d82ba5d4647fdc6552a21130b19281849a':
  fix viewport width variable by using underscore instead of hyphen

10 years agoam a36253b8: fix viewport width variable by using underscore instead of hyphen
Scott Main [Thu, 27 Mar 2014 20:08:18 +0000 (20:08 +0000)]
am a36253b8: fix viewport width variable by using underscore instead of hyphen

* commit 'a36253b8b05d94fb27a67522757b07781da2bd43':
  fix viewport width variable by using underscore instead of hyphen

10 years agofix viewport width variable by using underscore instead of hyphen
Scott Main [Thu, 27 Mar 2014 19:56:26 +0000 (12:56 -0700)]
fix viewport width variable by using underscore instead of hyphen

Change-Id: I866fa7016453b9e242df5e68f26bf94eac672feb

10 years agoam b8702917: am 75f21bc7: Merge "add 2x header logo and add override to viewport...
Scott Main [Thu, 27 Mar 2014 03:23:11 +0000 (03:23 +0000)]
am b8702917: am 75f21bc7: Merge "add 2x header logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs." into klp-docs

* commit 'b8702917c61923bc4dc5f6284482e1296b783bd4':
  add 2x header logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs.

10 years agoam 514c8254: am 4b270cdf: Update the sdk templates to support the Android Wear microsite
Scott Main [Thu, 27 Mar 2014 03:23:11 +0000 (03:23 +0000)]
am 514c8254: am 4b270cdf: Update the sdk templates to support the Android Wear microsite

* commit '514c8254d0a78a4153c442bc0789da8a10ce8b0b':
  Update the sdk templates to support the Android Wear microsite

10 years agoam 75f21bc7: Merge "add 2x header logo and add override to viewport width for landing...
Scott Main [Thu, 27 Mar 2014 03:17:10 +0000 (03:17 +0000)]
am 75f21bc7: Merge "add 2x header logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs." into klp-docs

* commit '75f21bc79e18f5bdf7676eeab6681e8f4a32e688':
  add 2x header logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs.

10 years agoam 4b270cdf: Update the sdk templates to support the Android Wear microsite
Scott Main [Thu, 27 Mar 2014 03:17:09 +0000 (03:17 +0000)]
am 4b270cdf: Update the sdk templates to support the Android Wear microsite

* commit '4b270cdf3678998370c2c3629711797ec7ab8a5a':
  Update the sdk templates to support the Android Wear microsite

10 years agoMerge "add 2x header logo and add override to viewport width for landing pages. chang...
Scott Main [Thu, 27 Mar 2014 03:15:19 +0000 (03:15 +0000)]
Merge "add 2x header logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs." into klp-docs

10 years agoadd 2x header logo and add override to viewport width for landing pages.
Scott Main [Thu, 27 Mar 2014 02:52:14 +0000 (19:52 -0700)]
add 2x header logo and add override to viewport width for landing pages.
changing the viewport to 970 ensures proper layout space for floating divs.

Change-Id: Iea980b4dfe1cca8a2b517f171a847a0e2788b1f0

10 years agoUpdate the sdk templates to support the Android Wear microsite
Scott Main [Wed, 12 Mar 2014 03:17:52 +0000 (20:17 -0700)]
Update the sdk templates to support the Android Wear microsite

Change-Id: I848f442b3bc66ee2fb87db8200df370d13762d29

10 years agoam cc851243: Merge "Add annotation support lib." into klp-ub-dev
Xavier Ducrohet [Wed, 26 Mar 2014 18:10:46 +0000 (18:10 +0000)]
am cc851243: Merge "Add annotation support lib." into klp-ub-dev

* commit 'cc85124393c438986e6639bc90906edf2dc2ca7a':
  Add annotation support lib.

10 years agoMerge "Add annotation support lib." into klp-ub-dev
Xavier Ducrohet [Wed, 26 Mar 2014 18:06:40 +0000 (18:06 +0000)]
Merge "Add annotation support lib." into klp-ub-dev

10 years agoAdd annotation support lib.
Xavier Ducrohet [Wed, 26 Mar 2014 17:50:38 +0000 (10:50 -0700)]
Add annotation support lib.

Change-Id: I5a4ddbdf09a09db944e16ed6baab604aa1710974

10 years agoam 49b4ef0b: am fd0be925: docs: Added SDK version to the ADT bundles download path...
Ricardo Cervera [Tue, 25 Mar 2014 20:33:03 +0000 (20:33 +0000)]
am 49b4ef0b: am fd0be925: docs: Added SDK version to the ADT bundles download path in the CS template.

* commit '49b4ef0badd51ce3af0511206e20114414a6c427':
  docs: Added SDK version to the ADT bundles download path in the CS template.

10 years agoam fd0be925: docs: Added SDK version to the ADT bundles download path in the CS template.
Ricardo Cervera [Tue, 25 Mar 2014 20:27:48 +0000 (20:27 +0000)]
am fd0be925: docs: Added SDK version to the ADT bundles download path in the CS template.

* commit 'fd0be925bb6e34768f9f11cf5325d1fcfbf39410':
  docs: Added SDK version to the ADT bundles download path in the CS template.

10 years agodocs: Added SDK version to the ADT bundles download path in the CS template.
Ricardo Cervera [Tue, 25 Mar 2014 19:33:33 +0000 (12:33 -0700)]
docs: Added SDK version to the ADT bundles download path in the CS template.

Change-Id: Ib222684754779b908cb10e6d8f9e5778101c9b96

10 years agoam 266cf4f2: am f39752e9: Skip the product-scoped --product flag if it\'s set in...
Ying Wang [Tue, 25 Mar 2014 09:56:52 +0000 (09:56 +0000)]
am 266cf4f2: am f39752e9: Skip the product-scoped --product flag if it\'s set in LOCAL_AAPT_FLAGS

* commit '266cf4f2595323170fe02db05835884b4522a0f9':
  Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS

10 years agoam f39752e9: Skip the product-scoped --product flag if it\'s set in LOCAL_AAPT_FLAGS
Ying Wang [Mon, 24 Mar 2014 21:21:26 +0000 (21:21 +0000)]
am f39752e9: Skip the product-scoped --product flag if it\'s set in LOCAL_AAPT_FLAGS

* commit 'f39752e99b4e5083f1e91c46722f87def8143b49':
  Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS

10 years agoFix removal of PRODUCT_PREBUILT_WEBVIEWCHROMIUM
Mark Renouf [Fri, 21 Mar 2014 15:50:35 +0000 (11:50 -0400)]
Fix removal of PRODUCT_PREBUILT_WEBVIEWCHROMIUM

Change-Id: I8a6bad054ac22592f0d341bb3ebbe4cc74828698

10 years agoSkip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS
Ying Wang [Fri, 21 Mar 2014 00:28:57 +0000 (17:28 -0700)]
Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS

Bug: 11335547
Change-Id: Ic08b7557a288508e8e8d14a725923960c47f5ca0

10 years agoAdd v17/leanback to pathmap.
Tim Kilbourn [Tue, 18 Mar 2014 20:37:51 +0000 (13:37 -0700)]
Add v17/leanback to pathmap.

Change-Id: I3032710da8cf8714516bf78f0971223257dfe1ec

10 years agoam bb79f9d2: am b7b49711: add some css to support android wear sub-site
Scott Main [Tue, 18 Mar 2014 12:37:22 +0000 (12:37 +0000)]
am bb79f9d2: am b7b49711: add some css to support android wear sub-site

* commit 'bb79f9d2a52c7f1e20bd74e5d80b2df4119cec82':
  add some css to support android wear sub-site

10 years agoam 264d4001: (-s ours) am 7503e736: 4.4.3 is MR2, version boogaloo!
Dianne Hackborn [Tue, 18 Mar 2014 12:37:22 +0000 (12:37 +0000)]
am 264d4001: (-s ours) am 7503e736: 4.4.3 is MR2, version boogaloo!

* commit '264d4001e7d01e302f93803d161f778fb200e346':
  4.4.3 is MR2, version boogaloo!

10 years agoam b7b49711: add some css to support android wear sub-site
Scott Main [Tue, 18 Mar 2014 12:35:42 +0000 (12:35 +0000)]
am b7b49711: add some css to support android wear sub-site

* commit 'b7b497115fb19d17a3e5de20646a5eac759c0095':
  add some css to support android wear sub-site

10 years agoadd some css to support android wear sub-site
Scott Main [Tue, 18 Mar 2014 12:29:15 +0000 (05:29 -0700)]
add some css to support android wear sub-site

Change-Id: Ibce2c596219fb86f433075c88a0af9d0cc1007b3

10 years agoam 7503e736: 4.4.3 is MR2, version boogaloo!
Dianne Hackborn [Tue, 11 Mar 2014 23:22:38 +0000 (23:22 +0000)]
am 7503e736: 4.4.3 is MR2, version boogaloo!

* commit '7503e736ebb0161a23ff0ee39a307cd436ea8afc':
  4.4.3 is MR2, version boogaloo!

10 years ago4.4.3 is MR2, version boogaloo!
Dianne Hackborn [Tue, 11 Mar 2014 21:54:09 +0000 (14:54 -0700)]
4.4.3 is MR2, version boogaloo!

Change-Id: I1a06850393247183fa3db9fbd3fbc8774f181a26

10 years agoAdd init.environ.rc to installclean
Adam Hampson [Fri, 7 Mar 2014 23:53:44 +0000 (15:53 -0800)]
Add init.environ.rc to installclean

BOOTCLASSPATH needs to be rebuilt when switching between build
targets.

Bug: 13282187

Change-Id: I16816abb4246878a60e1aa8c91b6b38c7339950e
Signed-off-by: Adam Hampson <ahampson@google.com>
10 years agoRe-order atree files so PRODUCT_SDK_ATREE_FILES can provide overrides.
Griff Hazen [Fri, 28 Feb 2014 16:45:59 +0000 (08:45 -0800)]
Re-order atree files so PRODUCT_SDK_ATREE_FILES can provide overrides.

Change-Id: Iecea3f3af628d89df65a44293a977b2bce35bf28

10 years agoRemove the default sdk.atree if custom one is set.
Ying Wang [Tue, 18 Feb 2014 22:29:59 +0000 (14:29 -0800)]
Remove the default sdk.atree if custom one is set.

Change-Id: I5d20b030db5ef29d7ff6eb64a0a1e11a4283e85d

10 years agoMerge "Make the module existence check nonfatal" into klp-modular-dev
Ying Wang [Tue, 18 Feb 2014 19:11:50 +0000 (19:11 +0000)]
Merge "Make the module existence check nonfatal" into klp-modular-dev

10 years agoam 8a56079c: am 5c92d966: am 541b4941: New temporary templates set for dynamic conten...
Dirk Dougherty [Sat, 15 Feb 2014 18:16:51 +0000 (18:16 +0000)]
am 8a56079c: am 5c92d966: am 541b4941: New temporary templates set for dynamic content support.

* commit '8a56079c74765afa405a96bd025f2bddac4e17b6':
  New temporary templates set for dynamic content support.

10 years agoam 5c92d966: am 541b4941: New temporary templates set for dynamic content support.
Dirk Dougherty [Sat, 15 Feb 2014 18:14:37 +0000 (18:14 +0000)]
am 5c92d966: am 541b4941: New temporary templates set for dynamic content support.

* commit '5c92d966076b28024a9efd6c8456445e207748f1':
  New temporary templates set for dynamic content support.

10 years agoam 541b4941: New temporary templates set for dynamic content support.
Dirk Dougherty [Sat, 15 Feb 2014 18:12:08 +0000 (18:12 +0000)]
am 541b4941: New temporary templates set for dynamic content support.

* commit '541b494103857da31505ba745b0da5bdbe0499b9':
  New temporary templates set for dynamic content support.

10 years agoNew temporary templates set for dynamic content support.
Dirk Dougherty [Sat, 15 Feb 2014 02:31:53 +0000 (18:31 -0800)]
New temporary templates set for dynamic content support.

Change-Id: I066e43cdebaf66c0d8b5e3622a286dc2c88c47b5

10 years agoMake the module existence check nonfatal
Ying Wang [Fri, 14 Feb 2014 21:39:42 +0000 (13:39 -0800)]
Make the module existence check nonfatal

Now we have sdk variants that may inherit the non-existent module names
from the device product.

Change-Id: Ibe96a33cde650fd79ae4731561dcb674203c3b91

10 years agoMerge "Support custom sdk.atree files." into klp-modular-dev
Ying Wang [Wed, 12 Feb 2014 20:54:30 +0000 (20:54 +0000)]
Merge "Support custom sdk.atree files." into klp-modular-dev

10 years agoam e2652df8: am 22866695: am 2c2c0534: set a smaller line height for sidebox headers...
Scott Main [Wed, 12 Feb 2014 16:08:32 +0000 (16:08 +0000)]
am e2652df8: am 22866695: am 2c2c0534: set a smaller line height for sidebox headers to avoid whitespace at the top

* commit 'e2652df8d7411854b3b00adf7c6a6a0af99a545d':
  set a smaller line height for sidebox headers to avoid whitespace at the top

10 years agoam 22866695: am 2c2c0534: set a smaller line height for sidebox headers to avoid...
Scott Main [Wed, 12 Feb 2014 16:06:03 +0000 (16:06 +0000)]
am 22866695: am 2c2c0534: set a smaller line height for sidebox headers to avoid whitespace at the top

* commit '228666956ade81aa8f993eed70f361ec93073bad':
  set a smaller line height for sidebox headers to avoid whitespace at the top

10 years agoam 2c2c0534: set a smaller line height for sidebox headers to avoid whitespace at...
Scott Main [Wed, 12 Feb 2014 16:02:57 +0000 (16:02 +0000)]
am 2c2c0534: set a smaller line height for sidebox headers to avoid whitespace at the top

* commit '2c2c053490aa3a2102c0dce95fcae0d22b77a71b':
  set a smaller line height for sidebox headers to avoid whitespace at the top

10 years agoset a smaller line height for sidebox headers to avoid whitespace at the top
Scott Main [Wed, 12 Feb 2014 02:16:20 +0000 (18:16 -0800)]
set a smaller line height for sidebox headers to avoid whitespace at the top

Change-Id: I8f1c4de275f3d7b2f55460bf4dc32a9a3d6b04ae

10 years agoChange core_tiny to not be minimal font footprint.
Justin Koh [Tue, 11 Feb 2014 03:28:15 +0000 (19:28 -0800)]
Change core_tiny to not be minimal font footprint.

Change core_tiny to not be minimal font footprint: UX really wants roboto
condensed. Checked /proc/meminfo before and after the change and didn't
see much difference.

Change-Id: I94072f674ff678dfdbddd66d3792e63245e5e7da

10 years agoam 960d919e: resolved conflicts for merge of 4df82b3e to klp-dev-plus-aosp
Ying Wang [Sat, 8 Feb 2014 18:35:13 +0000 (18:35 +0000)]
am 960d919e: resolved conflicts for merge of 4df82b3e to klp-dev-plus-aosp

* commit '960d919e814726f05ad1a9b82e6a9677f9977f15':
  Allow proguarding the main app and the test app in a single run.

10 years agoresolved conflicts for merge of 4df82b3e to klp-dev-plus-aosp
Ying Wang [Sat, 8 Feb 2014 18:31:36 +0000 (10:31 -0800)]
resolved conflicts for merge of 4df82b3e to klp-dev-plus-aosp

Change-Id: I7a1d9e1954ede06a818814bd05a77c69f1ed3bc6

10 years agoAllow proguarding the main app and the test app in a single run.
Mihail Dumitrescu [Fri, 7 Feb 2014 15:18:59 +0000 (15:18 +0000)]
Allow proguarding the main app and the test app in a single run.

Bug: 12895101
Change-Id: I6804d73306a164d3e3ec0cab4743f9582b5ef2cf

10 years agoSet up rules to merge AndroidManifest.xmls
Ying Wang [Thu, 6 Feb 2014 02:24:45 +0000 (18:24 -0800)]
Set up rules to merge AndroidManifest.xmls

Now you can merge the library manifest files to the main app's
AndroidManifest.xml with LOCAL_FULL_LIBS_MANIFEST_FILES.
LOCAL_FULL_LIBS_MANIFEST_FILES is a list of paths relative to the top of
the source tree.

Bug: 12907528
Change-Id: I16a347c83dfb6fbbb7d5d40284b7c65aa682fdd2

10 years agoMerge "Allow multiple asset directories in aapt" into klp-modular-dev
Adam Lesinski [Wed, 5 Feb 2014 00:46:59 +0000 (00:46 +0000)]
Merge "Allow multiple asset directories in aapt" into klp-modular-dev

10 years agoAllow multiple asset directories in aapt
Adam Lesinski [Tue, 28 Jan 2014 00:08:28 +0000 (16:08 -0800)]
Allow multiple asset directories in aapt

AAPT already supports this.

Change-Id: I293c7543fb43b15eedf2162416da48915ce02db8

10 years agoChange PLATFORM_VERSION and PLATFORM_VERSION_CODENAME to KKWT.
Justin Koh [Tue, 4 Feb 2014 00:26:43 +0000 (16:26 -0800)]
Change PLATFORM_VERSION and PLATFORM_VERSION_CODENAME to KKWT.

Change PLATFORM_VERSION and PLATFORM_VERSION_CODENAME to KKWT, as discussed.

Change-Id: Ia2d8628c4e9ee6b3cf654c8bdfc966a4af5c573c

10 years agoMerge "(DO NOT MERGE) Revert "Make libart the default runtime"" into klp-modular-dev
Noreen Tolland [Fri, 31 Jan 2014 23:13:24 +0000 (23:13 +0000)]
Merge "(DO NOT MERGE) Revert "Make libart the default runtime"" into klp-modular-dev

10 years ago(DO NOT MERGE) Revert "Make libart the default runtime"
Justin Mattson [Thu, 30 Jan 2014 23:30:08 +0000 (15:30 -0800)]
(DO NOT MERGE) Revert "Make libart the default runtime"

This reverts commit 08d410f53249c18d752f56a881ed2335403080d4.

10 years agoAdd atrace for supporting systrace tool
Nick Vaccaro [Fri, 24 Jan 2014 18:19:21 +0000 (10:19 -0800)]
Add atrace for supporting systrace tool

Change-Id: I6504a447218a70b0d148c0b5802228fb28934a0a
Signed-off-by: Nick Vaccaro <nvaccaro@google.com>
10 years agoam 190ebe94: Merge "pdk: add android_common.jar" into klp-volantis-dev
Colin Cross [Thu, 30 Jan 2014 00:59:55 +0000 (00:59 +0000)]
am 190ebe94: Merge "pdk: add android_common.jar" into klp-volantis-dev

* commit '190ebe94e1a3c18183fa1940e7599b4d6f70b470':
  pdk: add android_common.jar

10 years agoMerge "pdk: add android_common.jar" into klp-volantis-dev
Colin Cross [Thu, 30 Jan 2014 00:53:55 +0000 (00:53 +0000)]
Merge "pdk: add android_common.jar" into klp-volantis-dev

10 years agoSupport custom sdk.atree files.
Ying Wang [Wed, 29 Jan 2014 21:35:55 +0000 (13:35 -0800)]
Support custom sdk.atree files.

Bug: 12683047
Change-Id: I79ca1eff81e947d03c50759d47426487e48435d0

10 years agoam bb783f27: am a6e8c6c1: am f72e1846: am c9e142e6: Merge "add \'get started\' link...
Scott Main [Wed, 29 Jan 2014 20:17:05 +0000 (20:17 +0000)]
am bb783f27: am a6e8c6c1: am f72e1846: am c9e142e6: Merge "add \'get started\' link to the bottom of class home pages" into klp-docs

* commit 'bb783f27bd0de3fc25d47dd7b00df62ca9504f7a':
  add 'get started' link to the bottom of class home pages

10 years agoam a6e8c6c1: am f72e1846: am c9e142e6: Merge "add \'get started\' link to the bottom...
Scott Main [Wed, 29 Jan 2014 20:15:01 +0000 (20:15 +0000)]
am a6e8c6c1: am f72e1846: am c9e142e6: Merge "add \'get started\' link to the bottom of class home pages" into klp-docs

* commit 'a6e8c6c1e0f659b3532bd86631104360b54016ea':
  add 'get started' link to the bottom of class home pages

10 years agoam f72e1846: am c9e142e6: Merge "add \'get started\' link to the bottom of class...
Scott Main [Wed, 29 Jan 2014 20:11:48 +0000 (20:11 +0000)]
am f72e1846: am c9e142e6: Merge "add \'get started\' link to the bottom of class home pages" into klp-docs

* commit 'f72e1846898ec07cedf301ac76875cfa9f1164bc':
  add 'get started' link to the bottom of class home pages

10 years agoam c9e142e6: Merge "add \'get started\' link to the bottom of class home pages" into...
Scott Main [Wed, 29 Jan 2014 20:08:49 +0000 (20:08 +0000)]
am c9e142e6: Merge "add \'get started\' link to the bottom of class home pages" into klp-docs

* commit 'c9e142e62d60b39bb5bd3459358a16c00fc557f3':
  add 'get started' link to the bottom of class home pages

10 years agoMerge "add 'get started' link to the bottom of class home pages" into klp-docs
Scott Main [Wed, 29 Jan 2014 20:07:13 +0000 (20:07 +0000)]
Merge "add 'get started' link to the bottom of class home pages" into klp-docs

10 years agopdk: add android_common.jar
Colin Cross [Wed, 29 Jan 2014 18:01:37 +0000 (10:01 -0800)]
pdk: add android_common.jar

Add android_common.jar to the pdk java libraries to allow partners
to build test apps against it.

Change-Id: I3f3c0f6ef086489aec293e10b0d707845b174655

10 years agoam 833188c1: am e7bd4f5c: am 472a4858: Merge "gtest needs -lpthread."
Elliott Hughes [Wed, 29 Jan 2014 01:55:36 +0000 (01:55 +0000)]
am 833188c1: am e7bd4f5c: am 472a4858: Merge "gtest needs -lpthread."

* commit '833188c16ea5d2f12aa0108119c327d6cd31d4ea':
  gtest needs -lpthread.

10 years agoam e7bd4f5c: am 472a4858: Merge "gtest needs -lpthread."
Elliott Hughes [Wed, 29 Jan 2014 01:53:14 +0000 (01:53 +0000)]
am e7bd4f5c: am 472a4858: Merge "gtest needs -lpthread."

* commit 'e7bd4f5cdf5d1ac0c49d42ed41322f10e7f34f9b':
  gtest needs -lpthread.

10 years agoam 472a4858: Merge "gtest needs -lpthread."
Elliott Hughes [Wed, 29 Jan 2014 01:50:34 +0000 (01:50 +0000)]
am 472a4858: Merge "gtest needs -lpthread."

* commit '472a48585ec1cfb66c5716f85b0efdf528b29f5d':
  gtest needs -lpthread.

10 years agoMerge "gtest needs -lpthread."
Elliott Hughes [Wed, 29 Jan 2014 01:45:17 +0000 (01:45 +0000)]
Merge "gtest needs -lpthread."

10 years agogtest needs -lpthread.
Elliott Hughes [Wed, 29 Jan 2014 01:32:30 +0000 (17:32 -0800)]
gtest needs -lpthread.

Host gtests that don't use pthreads themselves need to be linked
against libpthread because gtest itself uses pthreads to ensure
thread-safety. (It can't know in advance whether the code under
test is going to spin up threads, so it has to be pessimistic.)

Change-Id: I14fb1098c163d7fe6ae9a9a0314acead4ec9383d

10 years agoam be7575ec: am cba215dd: am d21197d5: Merge "Make libart the default runtime"
Brian Carlstrom [Wed, 29 Jan 2014 00:44:02 +0000 (00:44 +0000)]
am be7575ec: am cba215dd: am d21197d5: Merge "Make libart the default runtime"

* commit 'be7575ecb1827784f83582847749aa59c664d29e':
  Make libart the default runtime

10 years agoam cba215dd: am d21197d5: Merge "Make libart the default runtime"
Brian Carlstrom [Wed, 29 Jan 2014 00:41:31 +0000 (00:41 +0000)]
am cba215dd: am d21197d5: Merge "Make libart the default runtime"

* commit 'cba215dd3241ae62416800f8d97d114d8a6e1a9a':
  Make libart the default runtime

10 years agoam d21197d5: Merge "Make libart the default runtime"
Brian Carlstrom [Wed, 29 Jan 2014 00:39:45 +0000 (00:39 +0000)]
am d21197d5: Merge "Make libart the default runtime"

* commit 'd21197d50caaa025bd823a004984a2820bb3c2e2':
  Make libart the default runtime

10 years agoMerge "Make libart the default runtime"
Brian Carlstrom [Wed, 29 Jan 2014 00:32:23 +0000 (00:32 +0000)]
Merge "Make libart the default runtime"

10 years agoam f7784e46: am 1a0e8501: am 1a731adf: Merge "Fix KERNEL_HEADERS_ARCH for mips and...
Elliott Hughes [Tue, 28 Jan 2014 21:37:15 +0000 (21:37 +0000)]
am f7784e46: am 1a0e8501: am 1a731adf: Merge "Fix KERNEL_HEADERS_ARCH for mips and x86."

* commit 'f7784e46170e90cb38ddbab15b7aa3a4a7e2d07d':
  Fix KERNEL_HEADERS_ARCH for mips and x86.

10 years agoam 1a0e8501: am 1a731adf: Merge "Fix KERNEL_HEADERS_ARCH for mips and x86."
Elliott Hughes [Tue, 28 Jan 2014 21:35:25 +0000 (21:35 +0000)]
am 1a0e8501: am 1a731adf: Merge "Fix KERNEL_HEADERS_ARCH for mips and x86."

* commit '1a0e850141fe19e1f1d503822893b8d66c0bca69':
  Fix KERNEL_HEADERS_ARCH for mips and x86.

10 years agoam 1a731adf: Merge "Fix KERNEL_HEADERS_ARCH for mips and x86."
Elliott Hughes [Tue, 28 Jan 2014 21:29:52 +0000 (21:29 +0000)]
am 1a731adf: Merge "Fix KERNEL_HEADERS_ARCH for mips and x86."

* commit '1a731adf943bc716cc7b9c95b321db02ad7216db':
  Fix KERNEL_HEADERS_ARCH for mips and x86.

10 years agoMerge "Fix KERNEL_HEADERS_ARCH for mips and x86."
Elliott Hughes [Tue, 28 Jan 2014 21:23:07 +0000 (21:23 +0000)]
Merge "Fix KERNEL_HEADERS_ARCH for mips and x86."

10 years agoFix KERNEL_HEADERS_ARCH for mips and x86.
Elliott Hughes [Tue, 28 Jan 2014 21:07:55 +0000 (13:07 -0800)]
Fix KERNEL_HEADERS_ARCH for mips and x86.

arm and arm64 have distinct headers, but mips and mip64, and x86 and x86_64
use headers that work for both widths. So where arm/arm64 need to handle the
second architecture case specially, all we need to do for the others is
hard-code the name. (x86_64.mk already hard-codes x86; we need to change
x86.mk for the case where we're building the 32-bit binaries for a mixed
system. mips64.mk doesn't exist yet, but when it does, it'll hard-code
just plain "mips" too.)

Change-Id: Ia6b9f77b4eb2c78729b454045875c409e0ea8197

10 years agoam dc5dd9b4: am d3737d07: am 49eb4409: Merge "build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA"
Brian Carlstrom [Tue, 28 Jan 2014 20:54:10 +0000 (20:54 +0000)]
am dc5dd9b4: am d3737d07: am 49eb4409: Merge "build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA"

* commit 'dc5dd9b47fe2a24410b3e70d320655f1b5455966':
  build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA

10 years agoam d3737d07: am 49eb4409: Merge "build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA"
Brian Carlstrom [Tue, 28 Jan 2014 20:52:17 +0000 (20:52 +0000)]
am d3737d07: am 49eb4409: Merge "build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA"

* commit 'd3737d07c8adb0848dcddb7df03d1e6b4378ab93':
  build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA

10 years agoam 49eb4409: Merge "build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA"
Brian Carlstrom [Tue, 28 Jan 2014 20:50:19 +0000 (20:50 +0000)]
am 49eb4409: Merge "build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA"

* commit '49eb440980db6680ec08c48b416e37e937bf9003':
  build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA

10 years agoMerge "build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA"
Brian Carlstrom [Tue, 28 Jan 2014 20:45:32 +0000 (20:45 +0000)]
Merge "build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA"

10 years agobuild: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA
Brian Carlstrom [Fri, 17 Jan 2014 07:25:27 +0000 (23:25 -0800)]
build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA

(cherry-picked from commit cd337c71ee65b17529a67af34d4c0b2824a4f175)

Change-Id: I6d8ab3b3cf52f6a6b15f1c8e8d00cdf59042436b

10 years agoMake libart the default runtime
Brian Carlstrom [Fri, 17 Jan 2014 01:55:07 +0000 (17:55 -0800)]
Make libart the default runtime

Change-Id: I4394f2bdef6f1be36f0f17f3b42d3e62bc2245ef

10 years agoam cb1ad445: am 0d24616d: am cdd14758: Merge "Add support for TARGET_GLOBAL_UNSUPPORT...
Colin Cross [Tue, 28 Jan 2014 02:37:21 +0000 (02:37 +0000)]
am cb1ad445: am 0d24616d: am cdd14758: Merge "Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS"

* commit 'cb1ad445663d190e204330b596b52e4734d9dcf0':
  Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS

10 years agoam 0d24616d: am cdd14758: Merge "Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS"
Colin Cross [Tue, 28 Jan 2014 02:34:05 +0000 (02:34 +0000)]
am 0d24616d: am cdd14758: Merge "Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS"

* commit '0d24616dd1b29e016aaae86761574fd88d701b6d':
  Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS

10 years agoam cdd14758: Merge "Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS"
Colin Cross [Tue, 28 Jan 2014 02:31:18 +0000 (02:31 +0000)]
am cdd14758: Merge "Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS"

* commit 'cdd1475834156b2e45b73ae86a949efa6c1215eb':
  Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS

10 years agoMerge "Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS"
Colin Cross [Tue, 28 Jan 2014 02:25:45 +0000 (02:25 +0000)]
Merge "Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS"

10 years agoAdd support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS
Colin Cross [Tue, 28 Jan 2014 01:34:21 +0000 (17:34 -0800)]
Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS

To ease the transition between toolchains, allow a target to specify
a list of cflags that the toolchain does not support.  These will be
filtered out of the cflags provided by the module.

Add TARGET_GLOBAL_UNSUPPORTED_CFLAGS := -fstack-protector for the
aarch64 toolchain, it does not yet suport -fstack-protector.

Change-Id: I168d0c6f131326fad305ec86fad46e6a3e03295a

10 years agoam 69c36ee7: am 4fbf23ef: am 0a3cf1a0: Merge "Remove libthread_db from the default...
Elliott Hughes [Tue, 28 Jan 2014 00:59:15 +0000 (00:59 +0000)]
am 69c36ee7: am 4fbf23ef: am 0a3cf1a0: Merge "Remove libthread_db from the default include path."

* commit '69c36ee7a8c1e3d8c7ca04d61f75d95585c58253':
  Remove libthread_db from the default include path.

10 years agoam 4fbf23ef: am 0a3cf1a0: Merge "Remove libthread_db from the default include path."
Elliott Hughes [Tue, 28 Jan 2014 00:54:33 +0000 (00:54 +0000)]
am 4fbf23ef: am 0a3cf1a0: Merge "Remove libthread_db from the default include path."

* commit '4fbf23ef8267849ce88217a256b394de3904a4f6':
  Remove libthread_db from the default include path.

10 years agoam 0a3cf1a0: Merge "Remove libthread_db from the default include path."
Elliott Hughes [Tue, 28 Jan 2014 00:43:29 +0000 (00:43 +0000)]
am 0a3cf1a0: Merge "Remove libthread_db from the default include path."

* commit '0a3cf1a0e5c6dbe132c1dc5e13293960c5e7b103':
  Remove libthread_db from the default include path.

10 years agoam a8d15474: am 04cff708: resolved conflicts for merge of 7382ec7d to klp-dev-plus...
Ying Wang [Tue, 28 Jan 2014 00:08:19 +0000 (00:08 +0000)]
am a8d15474: am 04cff708: resolved conflicts for merge of 7382ec7d to klp-dev-plus-aosp

* commit 'a8d15474ebb7b595f842ffb23a36cce9bc382f10':
  ota_from_target_files: Add an option to not sign OTA packages

10 years agoam 04cff708: resolved conflicts for merge of 7382ec7d to klp-dev-plus-aosp
Ying Wang [Tue, 28 Jan 2014 00:00:50 +0000 (00:00 +0000)]
am 04cff708: resolved conflicts for merge of 7382ec7d to klp-dev-plus-aosp

* commit '04cff70804810d27e1fcbef556ebfdc39278d746':
  ota_from_target_files: Add an option to not sign OTA packages

10 years agoMerge "Remove libthread_db from the default include path."
Elliott Hughes [Tue, 28 Jan 2014 00:00:19 +0000 (00:00 +0000)]
Merge "Remove libthread_db from the default include path."

10 years agoresolved conflicts for merge of 7382ec7d to klp-dev-plus-aosp
Ying Wang [Mon, 27 Jan 2014 23:56:45 +0000 (15:56 -0800)]
resolved conflicts for merge of 7382ec7d to klp-dev-plus-aosp

Change-Id: Ic414d3ec8b52b1045125e1b76deae8a4a59a5e52

10 years agoam 4695598d: am ae49acbd: am 1acb1b64: Merge changes I62504bad,I16208cca,I4e4ceec6
Colin Cross [Mon, 27 Jan 2014 23:46:39 +0000 (23:46 +0000)]
am 4695598d: am ae49acbd: am 1acb1b64: Merge changes I62504bad,I16208cca,I4e4ceec6

* commit '4695598df1fa11064a54421f60fee66032c673ee':
  add new gen/ directory for generated sources
  warn on LOCAL_MODULE_PATH in multiarch shared libraries
  Support LOCAL_MODULE_RELATIVE_PATH

10 years agoRemove libthread_db from the default include path.
Elliott Hughes [Mon, 27 Jan 2014 23:43:19 +0000 (15:43 -0800)]
Remove libthread_db from the default include path.

This should never have been on the default include path.

The NDK statically links its own libthread_db, so I'm removing
bionic's unused copy from devices.

Bug: 11882807
Change-Id: I49a67fe0902cc4bc178360f6c993959774d74e3a