OSDN Git Service
David Friedman [Tue, 9 Dec 2014 22:20:21 +0000 (22:20 +0000)]
am
03e066b7: am
83e96ca8: am
1a0159f2: Merge "CSS change changing default from "Using Eclipse" to "Using Android Studio" Bug
16679117" into lmp-docs
* commit '
03e066b75936c5f93d79b2912972ee6b6d760c1a':
CSS change changing default from "Using Eclipse" to "Using Android Studio" Bug
16679117
David Friedman [Tue, 9 Dec 2014 21:33:17 +0000 (21:33 +0000)]
am
83e96ca8: am
1a0159f2: Merge "CSS change changing default from "Using Eclipse" to "Using Android Studio" Bug
16679117" into lmp-docs
* commit '
83e96ca8c24256a989881d59d24f66d439c2f5f4':
CSS change changing default from "Using Eclipse" to "Using Android Studio" Bug
16679117
David Friedman [Tue, 9 Dec 2014 00:31:41 +0000 (00:31 +0000)]
am
1a0159f2: Merge "CSS change changing default from "Using Eclipse" to "Using Android Studio" Bug
16679117" into lmp-docs
* commit '
1a0159f216076579d128d17dc8292904606a3420':
CSS change changing default from "Using Eclipse" to "Using Android Studio" Bug
16679117
David Friedman [Mon, 8 Dec 2014 19:55:47 +0000 (19:55 +0000)]
Merge "CSS change changing default from "Using Eclipse" to "Using Android Studio" Bug
16679117" into lmp-docs
smain@google.com [Mon, 8 Dec 2014 07:24:39 +0000 (07:24 +0000)]
am
07c19f68: am
87b1b5ed: am
102db8b5: update sdk template with new studio downloads
* commit '
07c19f688866715c6c30d8d8d58a7a9fa9a47d00':
update sdk template with new studio downloads
smain@google.com [Mon, 8 Dec 2014 07:17:54 +0000 (07:17 +0000)]
am
87b1b5ed: am
102db8b5: update sdk template with new studio downloads
* commit '
87b1b5edb11644ac656a1d8df37201460289de94':
update sdk template with new studio downloads
smain@google.com [Mon, 8 Dec 2014 07:10:39 +0000 (07:10 +0000)]
am
102db8b5: update sdk template with new studio downloads
* commit '
102db8b58bd51aeaa7409924d5dc341f2f72b892':
update sdk template with new studio downloads
smain@google.com [Mon, 8 Dec 2014 06:39:24 +0000 (22:39 -0800)]
update sdk template with new studio downloads
Change-Id: Iee43f4f4eb5c63d94884a463a73fc016b5a05c4e
smain@google.com [Mon, 8 Dec 2014 03:59:56 +0000 (03:59 +0000)]
am
3984cca2: am
79ac4384: am
d53f0660: update to sdk page template for Android Studio downloads
* commit '
3984cca2a617bad37dc54885efbf86bc49b9c4f2':
update to sdk page template for Android Studio downloads
smain@google.com [Mon, 8 Dec 2014 03:53:00 +0000 (03:53 +0000)]
am
79ac4384: am
d53f0660: update to sdk page template for Android Studio downloads
* commit '
79ac4384637c77076f93307e61c8e2612df4a8cc':
update to sdk page template for Android Studio downloads
smain@google.com [Mon, 8 Dec 2014 03:46:13 +0000 (03:46 +0000)]
am
d53f0660: update to sdk page template for Android Studio downloads
* commit '
d53f0660f1fe40921d72b75abb9bfeee534b6b8c':
update to sdk page template for Android Studio downloads
smain@google.com [Thu, 4 Dec 2014 03:34:55 +0000 (19:34 -0800)]
update to sdk page template for Android Studio downloads
Change-Id: I729a1238a97909d4087f7396cc478a5aea0c43cd
(cherry picked from commit
85fd6240cfc2a395d3189a87214813b1568b0122)
Rich Slogar [Mon, 8 Dec 2014 03:10:15 +0000 (03:10 +0000)]
am
8242ce83: am
db8d79a9: am
fe4dd526: docs: sdkpage update [CP]
* commit '
8242ce83d1181e71eb6b417cc58d5bcdc181c927':
docs: sdkpage update [CP]
Rich Slogar [Mon, 8 Dec 2014 03:03:49 +0000 (03:03 +0000)]
am
db8d79a9: am
fe4dd526: docs: sdkpage update [CP]
* commit '
db8d79a9efefa4ba03a311904c4bf3b850f4f52b':
docs: sdkpage update [CP]
Rich Slogar [Mon, 8 Dec 2014 02:59:48 +0000 (02:59 +0000)]
am
fe4dd526: docs: sdkpage update [CP]
* commit '
fe4dd5263f344c5420780626410b84d7383e801d':
docs: sdkpage update [CP]
Rich Slogar [Mon, 3 Nov 2014 23:16:34 +0000 (15:16 -0800)]
docs: sdkpage update [CP]
Change-Id: I06c8878c4b449a472a71f224a17bf9fef794de20
(cherry picked from commit
627f711a5dad6b0878576a169c5601f41a083aba)
Ying Wang [Fri, 5 Dec 2014 00:42:02 +0000 (00:42 +0000)]
am
27eba54b: Add system propery ro.build.flavor.
* commit '
27eba54b20e1f1d597a979be1469b62dd262aecb':
Add system propery ro.build.flavor.
Ying Wang [Thu, 4 Dec 2014 23:19:08 +0000 (15:19 -0800)]
Add system propery ro.build.flavor.
ro.build.flavor is set to "$(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT)" in
system.img build.prop at build time,
and it won't be overridden by oem partition's build.prop.
Bug:
18605832
Change-Id: Ic917623dd43b74d9c601119db0b457483e8c4472
Dianne Hackborn [Thu, 4 Dec 2014 22:07:08 +0000 (22:07 +0000)]
am
0421d0b1: Fix issue #
18368417: 5.0 -> 5.1.
* commit '
0421d0b115208b50015781b09f3661b65d72e858':
Fix issue #
18368417: 5.0 -> 5.1.
Dianne Hackborn [Thu, 4 Dec 2014 20:10:32 +0000 (12:10 -0800)]
Fix issue #
18368417: 5.0 -> 5.1.
Change-Id: Icd7137fe8b1bda1c5aaf170aa7b19a58832144c8
Adam Lesinski [Thu, 4 Dec 2014 15:17:20 +0000 (15:17 +0000)]
am
57a3d3e1: Merge "Remove uses of density in PRODUCT_AAP_CONFIG" into lmp-mr1-dev
* commit '
57a3d3e1f48f1719fdead0b13495230d772955b4':
Remove uses of density in PRODUCT_AAP_CONFIG
Adam Lesinski [Wed, 3 Dec 2014 23:29:16 +0000 (23:29 +0000)]
Merge "Remove uses of density in PRODUCT_AAP_CONFIG" into lmp-mr1-dev
Adam Lesinski [Wed, 3 Dec 2014 00:13:09 +0000 (16:13 -0800)]
Remove uses of density in PRODUCT_AAP_CONFIG
Change-Id: I98594165515c07fa2e6b847266f7d8fa3283b52e
smain@google.com [Wed, 3 Dec 2014 18:36:34 +0000 (18:36 +0000)]
am
e217fc3c: am
eee91eb2: am
d99989c5: Merge "new version of Helpouts recruit banner for TV and Wear" into lmp-docs
* commit '
e217fc3c3ee9a437dfdeda2c3cc0df99380dbfc0':
new version of Helpouts recruit banner for TV and Wear
smain@google.com [Wed, 3 Dec 2014 18:12:41 +0000 (18:12 +0000)]
am
eee91eb2: am
d99989c5: Merge "new version of Helpouts recruit banner for TV and Wear" into lmp-docs
* commit '
eee91eb24233fa0a14f2d273bebd18a4bcb87310':
new version of Helpouts recruit banner for TV and Wear
smain@google.com [Wed, 3 Dec 2014 03:04:49 +0000 (03:04 +0000)]
am
d99989c5: Merge "new version of Helpouts recruit banner for TV and Wear" into lmp-docs
* commit '
d99989c558c384312bd63cf3a5e1bbbd799bf4b5':
new version of Helpouts recruit banner for TV and Wear
smain@google.com [Wed, 3 Dec 2014 02:23:10 +0000 (02:23 +0000)]
Merge "new version of Helpouts recruit banner for TV and Wear" into lmp-docs
smain@google.com [Tue, 2 Dec 2014 19:01:20 +0000 (11:01 -0800)]
new version of Helpouts recruit banner for TV and Wear
Change-Id: I971e9043b60bdb925c2f648e0aff3de9d8c9cd81
Ying Wang [Tue, 2 Dec 2014 18:45:55 +0000 (18:45 +0000)]
am
8070b20f: Support to build dpi-specific apk variants.
* commit '
8070b20f9ec899a5dc27c7589f11c6db8c72180a':
Support to build dpi-specific apk variants.
Ying Wang [Tue, 2 Dec 2014 01:46:56 +0000 (17:46 -0800)]
Support to build dpi-specific apk variants.
In unbundled apps_only build, in addition to the base apk, you can also
build the dpi-specific apk variants, with:
LOCAL_DPI_VARIANTS := <a list of dpi names>
Previously user needs to include $(BUILD_PACKAGE) repeatedly with the
same package definition except dpi flags.
With this change, all the dpi-specific apk variants share the base apk's
compiled Java code and only diverge at the point we add resources/assets
to the apk.
Also we set up variables/targets/rules in a way those dpi-specific apks
appear to be independent apks to the users, for example, you can pass
"AppName_<dpi_name>" to tapas, and AppName_<dpi_name>.apk lives in its
own intermediate directory.
Bug:
18388705
Change-Id: I2ba4972ea7d1f796352fab2407888f996781ae44
smain@google.com [Thu, 27 Nov 2014 10:19:35 +0000 (10:19 +0000)]
am
43fbdb2a: am
dc8a05ca: am
570c2210: add support for shadowbox videos with start time specified with #t= in video url
* commit '
43fbdb2acb8e4e673d963630acbc32ab2717139c':
add support for shadowbox videos with start time specified with #t= in video url
smain@google.com [Thu, 27 Nov 2014 10:08:54 +0000 (10:08 +0000)]
am
dc8a05ca: am
570c2210: add support for shadowbox videos with start time specified with #t= in video url
* commit '
dc8a05ca6922642851f93889f90052765a8a2fb6':
add support for shadowbox videos with start time specified with #t= in video url
smain@google.com [Wed, 26 Nov 2014 11:56:55 +0000 (11:56 +0000)]
am
570c2210: add support for shadowbox videos with start time specified with #t= in video url
* commit '
570c2210b8ea16cc560e6b62ec06f8ad05fae9aa':
add support for shadowbox videos with start time specified with #t= in video url
smain@google.com [Wed, 26 Nov 2014 03:01:40 +0000 (19:01 -0800)]
add support for shadowbox videos with start time specified with #t= in video url
Change-Id: I165620326f44f8e95bb34a2b623e67fc3b7dcc50
smain@google.com [Wed, 26 Nov 2014 01:46:20 +0000 (01:46 +0000)]
am
d020c517: am
39343e30: am
ccb54008: rev css version to clear browser caches
* commit '
d020c51752611b8b647db9dad94519e5514fc66f':
rev css version to clear browser caches
smain@google.com [Wed, 26 Nov 2014 01:46:18 +0000 (01:46 +0000)]
am
17874347: am
b90e4792: am
3a9d50e1: move the next/previous links in design docs up 25px to avoid overlap with long titles
* commit '
17874347cc72e88bb318057bca01d36a47dfc5e4':
move the next/previous links in design docs up 25px to avoid overlap with long titles
smain@google.com [Wed, 26 Nov 2014 00:59:47 +0000 (00:59 +0000)]
am
39343e30: am
ccb54008: rev css version to clear browser caches
* commit '
39343e30796d4fbf3d6daa5869acdb71a9fb3a87':
rev css version to clear browser caches
smain@google.com [Wed, 26 Nov 2014 00:59:42 +0000 (00:59 +0000)]
am
b90e4792: am
3a9d50e1: move the next/previous links in design docs up 25px to avoid overlap with long titles
* commit '
b90e4792dea4271395e216a9d37c712572395003':
move the next/previous links in design docs up 25px to avoid overlap with long titles
smain@google.com [Wed, 26 Nov 2014 00:31:57 +0000 (00:31 +0000)]
am
ccb54008: rev css version to clear browser caches
* commit '
ccb540081ca5f1c69bb1b2721cab319b88f9dd94':
rev css version to clear browser caches
smain@google.com [Wed, 26 Nov 2014 00:27:58 +0000 (00:27 +0000)]
am
3a9d50e1: move the next/previous links in design docs up 25px to avoid overlap with long titles
* commit '
3a9d50e19d9789cffc0d3d398733d909ee2ee618':
move the next/previous links in design docs up 25px to avoid overlap with long titles
smain@google.com [Wed, 26 Nov 2014 00:16:20 +0000 (16:16 -0800)]
rev css version to clear browser caches
Change-Id: I46e04a02a0c010777ba01af28044999a1cbe1e10
Roozbeh Pournader [Tue, 25 Nov 2014 22:33:07 +0000 (22:33 +0000)]
am
35e7c067: Add Lohit fonts to the build.
* commit '
35e7c067b88c4904d6a57b3bff64410ba0a3ecf3':
Add Lohit fonts to the build.
smain@google.com [Tue, 25 Nov 2014 21:34:10 +0000 (13:34 -0800)]
move the next/previous links in design docs up 25px to avoid overlap with long titles
Change-Id: I3428e4cf2959d0e171692d12d47e100b46b6733e
Roozbeh Pournader [Tue, 25 Nov 2014 18:52:20 +0000 (10:52 -0800)]
Add Lohit fonts to the build.
This is needed to support the Oriya script on the expanded font
builds, currently done using the Lohit Odia (Oriya) font.
Bug:
17686019
Change-Id: I2914a9f8f8dfc43797af1551acaa8e43f25007ed
smain@google.com [Mon, 24 Nov 2014 20:00:57 +0000 (20:00 +0000)]
am
096d3031: am
39e4cfab: am
f75ee21c: add analytics event tracking for shadowbox player and rig the \'notice-developers-video\' style links to also use shadowbox for video playback
* commit '
096d3031e3e4a0ac03c7bad4dfa90d1d41caa8e6':
add analytics event tracking for shadowbox player and rig the 'notice-developers-video' style links to also use shadowbox for video playback
smain@google.com [Mon, 24 Nov 2014 19:11:06 +0000 (19:11 +0000)]
am
39e4cfab: am
f75ee21c: add analytics event tracking for shadowbox player and rig the \'notice-developers-video\' style links to also use shadowbox for video playback
* commit '
39e4cfabed45984b884975d1e6e9b351e93d9d4a':
add analytics event tracking for shadowbox player and rig the 'notice-developers-video' style links to also use shadowbox for video playback
smain@google.com [Mon, 24 Nov 2014 19:02:36 +0000 (19:02 +0000)]
am
f75ee21c: add analytics event tracking for shadowbox player and rig the \'notice-developers-video\' style links to also use shadowbox for video playback
* commit '
f75ee21c34c199632815ad763b940ad0fc63f8ea':
add analytics event tracking for shadowbox player and rig the 'notice-developers-video' style links to also use shadowbox for video playback
smain@google.com [Mon, 24 Nov 2014 17:42:59 +0000 (09:42 -0800)]
add analytics event tracking for shadowbox player and
rig the 'notice-developers-video' style links to also use shadowbox for video playback
Change-Id: Ib48a7c5243ad926345ce9ae9bd572d59aea035f4
Michael Runge [Mon, 24 Nov 2014 02:40:33 +0000 (02:40 +0000)]
am
60f56e7d: am
996d8f48: Merge "Add support for tuning partitions" into lmp-sprout-dev
* commit '
60f56e7d15f8ae73a29585adfde4915a8ffc26bc':
Add support for tuning partitions
Michael Runge [Mon, 24 Nov 2014 02:37:02 +0000 (02:37 +0000)]
am
996d8f48: Merge "Add support for tuning partitions" into lmp-sprout-dev
* commit '
996d8f48a1b3e6e3a63344633546ff294cc67071':
Add support for tuning partitions
smain@google.com [Sat, 22 Nov 2014 00:35:40 +0000 (00:35 +0000)]
am
cf6ecd9f: am
2a87b781: am
698fff02: add style and script to play videos in a shadowbox anytime that a link appears in the page with class "video-shadowbox-button" the link must also have the youtube video set in the href with the ?v parameter
* commit '
cf6ecd9f904d70b1cdffefc216fb72d0b291d088':
add style and script to play videos in a shadowbox anytime that a link appears in the page with class "video-shadowbox-button" the link must also have the youtube video set in the href with the ?v parameter
smain@google.com [Sat, 22 Nov 2014 00:25:15 +0000 (00:25 +0000)]
am
2a87b781: am
698fff02: add style and script to play videos in a shadowbox anytime that a link appears in the page with class "video-shadowbox-button" the link must also have the youtube video set in the href with the ?v parameter
* commit '
2a87b7817d1eedf0ffcc112d3dc951392a465a2e':
add style and script to play videos in a shadowbox anytime that a link appears in the page with class "video-shadowbox-button" the link must also have the youtube video set in the href with the ?v parameter
Michael Runge [Fri, 21 Nov 2014 23:40:36 +0000 (23:40 +0000)]
Merge "Add support for tuning partitions" into lmp-sprout-dev
David Friedman [Fri, 21 Nov 2014 02:01:26 +0000 (18:01 -0800)]
CSS change changing default from "Using Eclipse" to "Using Android Studio"
Bug
16679117
Change-Id: I21e4546775114355d04d09888eff21877b5bcab8
smain@google.com [Fri, 21 Nov 2014 21:06:06 +0000 (21:06 +0000)]
am
698fff02: add style and script to play videos in a shadowbox anytime that a link appears in the page with class "video-shadowbox-button" the link must also have the youtube video set in the href with the ?v parameter
* commit '
698fff028ab6e58c45c7356922beaa7c6a2e9006':
add style and script to play videos in a shadowbox anytime that a link appears in the page with class "video-shadowbox-button" the link must also have the youtube video set in the href with the ?v parameter
smain@google.com [Fri, 21 Nov 2014 04:39:33 +0000 (20:39 -0800)]
add style and script to play videos in a shadowbox
anytime that a link appears in the page with class "video-shadowbox-button"
the link must also have the youtube video set in the href with the ?v parameter
Change-Id: I4af84f003075b8d2c43acd3295ce3955b141cc97
Dirk Dougherty [Fri, 21 Nov 2014 10:42:09 +0000 (10:42 +0000)]
Dirk Dougherty [Fri, 21 Nov 2014 10:37:02 +0000 (10:37 +0000)]
Michael Runge [Fri, 21 Nov 2014 08:46:03 +0000 (00:46 -0800)]
Add support for tuning partitions
Allow a simple mechanism to call tune2fs to modify an existing
partition without reformatting.
Bug:
18430740
Change-Id: I9210355b6bfec74d002d1f40b930330740f379a5
Ying Wang [Thu, 20 Nov 2014 20:28:05 +0000 (20:28 +0000)]
am
51840e4b: Support journal size board config variables. automerge:
e91b83d
* commit '
51840e4b2b87c5b7b045ebac412b0b3d1501643e':
Support journal size board config variables.
Ying Wang [Thu, 20 Nov 2014 20:22:33 +0000 (20:22 +0000)]
Support journal size board config variables.
automerge:
e91b83d
* commit '
e91b83d5e607031ab3da4f85cbb11a823aacf9ed':
Support journal size board config variables.
Dirk Dougherty [Thu, 20 Nov 2014 00:03:25 +0000 (00:03 +0000)]
Dirk Dougherty [Wed, 19 Nov 2014 03:34:34 +0000 (19:34 -0800)]
Support langs.
Change-Id: Ia01e4b41f0ebf2c54669428eef143dce5611d0bd
Ying Wang [Wed, 19 Nov 2014 02:03:13 +0000 (18:03 -0800)]
Support journal size board config variables.
A device can set up BOARD_SYSTEMIMAGE_JOURNAL_SIZE (number of journal blocks)
in its BoardConfig.mk.
To disable journaling, set "BOARD_SYSTEMIMAGE_JOURNAL_SIZE := 0".
BOARD_VENDORIMAGE_JOURNAL_SIZE and BOARD_OEMIMAGE_JOURNAL_SIZE work in
similar way.
Bug:
18430740
(cherry picked from commit
f3b86357e20a31ef0febe254f1f08706006f57fa)
Change-Id: Icc6c7e1b3be25b8e21b6a737492d944428e4a35a
Ying Wang [Wed, 19 Nov 2014 19:23:41 +0000 (19:23 +0000)]
am
f3b86357: Support journal size board config variables.
* commit '
f3b86357e20a31ef0febe254f1f08706006f57fa':
Support journal size board config variables.
Ying Wang [Wed, 19 Nov 2014 02:03:13 +0000 (18:03 -0800)]
Support journal size board config variables.
A device can set up BOARD_SYSTEMIMAGE_JOURNAL_SIZE (number of journal blocks)
in its BoardConfig.mk.
To disable journaling, set "BOARD_SYSTEMIMAGE_JOURNAL_SIZE := 0".
BOARD_VENDORIMAGE_JOURNAL_SIZE and BOARD_OEMIMAGE_JOURNAL_SIZE work in
similar way.
Bug:
18430740
Change-Id: I0594814fe19ffc54dff41ec2464e2e3a802b9419
Ying Wang [Wed, 19 Nov 2014 00:23:00 +0000 (00:23 +0000)]
am
ea4dfb75: Merge "Support prebuilt apk source selection based on PRODUCT_AAPT_PREF_CONFIG" into lmp-mr1-dev
* commit '
ea4dfb7551e680f7496e1d35c05bdad10ca58b4a':
Support prebuilt apk source selection based on PRODUCT_AAPT_PREF_CONFIG
Ying Wang [Wed, 19 Nov 2014 00:18:53 +0000 (00:18 +0000)]
Merge "Support prebuilt apk source selection based on PRODUCT_AAPT_PREF_CONFIG" into lmp-mr1-dev
Andreas Gampe [Wed, 19 Nov 2014 00:14:46 +0000 (00:14 +0000)]
am
bce1889b: am
f318cc43: (-s ours) Build: Support for compiled-classes file
* commit '
bce1889b8922fbbc2695756d3723029d4fd4cf66':
Build: Support for compiled-classes file
Andreas Gampe [Wed, 19 Nov 2014 00:10:28 +0000 (00:10 +0000)]
am
f318cc43: (-s ours) Build: Support for compiled-classes file
* commit '
f318cc436a0d7db372e03424a344c8dc9839d183':
Build: Support for compiled-classes file
Andreas Gampe [Tue, 18 Nov 2014 19:45:10 +0000 (11:45 -0800)]
Build: Support for compiled-classes file
Allow a compiled-classes file for pre-opting.
Bug:
18410571
(cherry picked from commit
4fec0bb265ac8cdbe883b8868abfcb56713db170)
Change-Id: Id54a97af606727e354b6914e46e35fdb8952aa04
Andreas Gampe [Tue, 18 Nov 2014 23:00:10 +0000 (23:00 +0000)]
am
4fec0bb2: Build: Support for compiled-classes file
* commit '
4fec0bb265ac8cdbe883b8868abfcb56713db170':
Build: Support for compiled-classes file
Andreas Gampe [Tue, 18 Nov 2014 19:45:10 +0000 (11:45 -0800)]
Build: Support for compiled-classes file
Allow a compiled-classes file for pre-opting.
Bug:
18410571
Change-Id: I8c69dd0fb8c04aaae0c4f062049cc9cce7d755c7
smain@google.com [Tue, 18 Nov 2014 16:42:50 +0000 (16:42 +0000)]
am
2e216835: am
9220b6e6: am
0dd70276: am
6bdcb981: followup to recent cookie max-age change to remove parameter and use 2-year for all cookies bug:
17781603
* commit '
2e216835ee6d35e1c7b692f9982c1bd34b8ce703':
followup to recent cookie max-age change to remove parameter and use 2-year for all cookies bug:
17781603
smain@google.com [Tue, 18 Nov 2014 16:39:39 +0000 (16:39 +0000)]
am
9220b6e6: am
0dd70276: am
6bdcb981: followup to recent cookie max-age change to remove parameter and use 2-year for all cookies bug:
17781603
* commit '
9220b6e676aefe152540a6cf832e5fd18817370e':
followup to recent cookie max-age change to remove parameter and use 2-year for all cookies bug:
17781603
smain@google.com [Tue, 18 Nov 2014 16:34:27 +0000 (16:34 +0000)]
am
0dd70276: am
6bdcb981: followup to recent cookie max-age change to remove parameter and use 2-year for all cookies bug:
17781603
* commit '
0dd70276f6cfe09010054897a80d406ea9ac13de':
followup to recent cookie max-age change to remove parameter and use 2-year for all cookies bug:
17781603
smain@google.com [Tue, 18 Nov 2014 16:30:31 +0000 (16:30 +0000)]
am
6bdcb981: followup to recent cookie max-age change to remove parameter and use 2-year for all cookies bug:
17781603
* commit '
6bdcb981ce098cae2fb9e690485ebaab47b2225a':
followup to recent cookie max-age change to remove parameter and use 2-year for all cookies bug:
17781603
Ying Wang [Tue, 18 Nov 2014 00:56:04 +0000 (16:56 -0800)]
Support prebuilt apk source selection based on PRODUCT_AAPT_PREF_CONFIG
Two new LOCAL variables are added to support dpi-specific prebuilt apk
selection:
- LOCAL_DPI_VARIANTS: specify a list of dpis the module provides with
specific prebuilt.
Example: LOCAL_DPI_VARIANTS := xxhdpi xhdpi hdpi mdpi
- LOCAL_DPI_FILE_STEM: specify the dpi-specific source file name
pattern.
Example: LOCAL_DPI_FILE_STEM := MyApp-%.apk
"%" will be substitued by $(PRODUCT_AAPT_PREF_CONFIG) in the core
build system.
If you don't set up LOCAL_DPI_FILE_STEM, the default is
$(LOCAL_MODULE)_%.apk.
The build system searches $(PRODUCT_AAPT_PREF_CONFIG) in a prebuilt apk
module's $(LOCAL_DPI_VARIANTS). If not found, use whatever
$(LOCAL_SRC_FILES) as the source file; Otherwise use $(LOCAL_DPI_FILE_STEM)
to construct the dpi-specific apk's source file name, and use whatever
directory name of $(LOCAL_SRC_FILES).
Bug:
18388705
Change-Id: I63cae73f1b6f880302142abc476b3ce1fb5500b5
Dave Langemak [Tue, 18 Nov 2014 01:03:08 +0000 (01:03 +0000)]
am
139f8a81: am
a4cf5cc9: (-s ours) am
5e923c91: Increment Android versions to 5.0.1
* commit '
139f8a8146f5b6d6c9da6dc744b3420d417bf3a5':
Increment Android versions to 5.0.1
Dave Langemak [Tue, 18 Nov 2014 00:56:49 +0000 (00:56 +0000)]
am
a4cf5cc9: (-s ours) am
5e923c91: Increment Android versions to 5.0.1
* commit '
a4cf5cc9ecc3c5d2658943117f7d182b26c77b30':
Increment Android versions to 5.0.1
Dave Langemak [Tue, 18 Nov 2014 00:46:21 +0000 (00:46 +0000)]
am
5e923c91: Increment Android versions to 5.0.1
* commit '
5e923c91b42f1df7ec3da97b1506dd9aa93795d0':
Increment Android versions to 5.0.1
Dave Langemak [Tue, 18 Nov 2014 00:37:50 +0000 (16:37 -0800)]
Increment Android versions to 5.0.1
Change-Id: I2880123f0d1215f2028e6d3bc3f88fee5714ae74
Ying Wang [Mon, 17 Nov 2014 19:13:32 +0000 (19:13 +0000)]
Ying Wang [Mon, 17 Nov 2014 19:01:18 +0000 (11:01 -0800)]
Fix PDK build.
Add frameworks/base/preloaded-classes to PRODUCT_COPY_FILES only if it
exists in the source tree.
Bug:
18305157
Change-Id: I46c277ebfb8095f9e5fe0fbb21276d932509f2eb
Ying Wang [Mon, 17 Nov 2014 18:24:27 +0000 (18:24 +0000)]
am
9a9d180f: Install preloaded-classes as a standalone configuration file
* commit '
9a9d180ff1cafc547bd9d3b31a10db749d8ab359':
Install preloaded-classes as a standalone configuration file
Ying Wang [Thu, 13 Nov 2014 23:19:12 +0000 (15:19 -0800)]
Install preloaded-classes as a standalone configuration file
Install preloaded-classes as a standalone configuration file
/system/etc/preloaded-classes, so we can configure different file per product.
To override the default frameworks/base/preloaded-classes, just override
in your product configuration makefile with PRODUCT_COPY_FILES before it
inherits from build/target/product/base.mk: if there are multiple items
in PRODUCT_COPY_FILES with the same destination, the first one takes
precedence.
Bug:
18305157
Change-Id: I937632b4a1aa73310ec90e73fd708fbd0c704a21
smain@google.com [Fri, 14 Nov 2014 19:53:07 +0000 (11:53 -0800)]
followup to recent cookie max-age change to remove parameter and use 2-year for all cookies
bug:
17781603
Change-Id: Id0da9d41e01c6a45672d1362fc1c5aa39e558904
Michael Runge [Fri, 14 Nov 2014 07:25:11 +0000 (07:25 +0000)]
am
100a9f07: am
11d21015: am
f178d364: Merge "Allow images to be readded to target-files" into lmp-dev
* commit '
100a9f072073f3c799deb72a62ffb500c1562c4c':
Allow images to be readded to target-files
Michael Runge [Fri, 14 Nov 2014 07:19:58 +0000 (07:19 +0000)]
am
11d21015: am
f178d364: Merge "Allow images to be readded to target-files" into lmp-dev
* commit '
11d210154d71a229e20eaebd6f9ea580b0c7f036':
Allow images to be readded to target-files
Michael Runge [Fri, 14 Nov 2014 07:17:22 +0000 (07:17 +0000)]
am
f178d364: Merge "Allow images to be readded to target-files" into lmp-dev
* commit '
f178d36441c3a688cfe5eb41a5ce724ba01a4ecf':
Allow images to be readded to target-files
Michael Runge [Fri, 14 Nov 2014 07:14:47 +0000 (07:14 +0000)]
Merge "Allow images to be readded to target-files" into lmp-dev
Michael Runge [Fri, 14 Nov 2014 05:41:08 +0000 (21:41 -0800)]
Allow images to be readded to target-files
There may be cases where various partitions were
modified (such as extra signing of boot/recovery)
which require the system partition to be regenerated
with a new recovery patch script. Allow a request
for the recovery patch to be rebuilt, and for
missing images to be readded to the existing images.
Change-Id: Ie93c5bc1161a0d5002002dca23e07742ce2ba468
Paul Lawrence [Fri, 14 Nov 2014 02:12:48 +0000 (02:12 +0000)]
Paul Lawrence [Fri, 14 Nov 2014 01:54:30 +0000 (17:54 -0800)]
Fix the build
Bug:
15984840
Bug:
18120110
Change-Id: I0224d5a31e03b711953d9496ecb00b6d88b8ef4c
Sami Tolvanen [Thu, 13 Nov 2014 23:53:41 +0000 (23:53 +0000)]
am
8d212ea8: DO NOT MERGE: Change verity key formats
* commit '
8d212ea8735233211b38f55819841fa97a744eaa':
DO NOT MERGE: Change verity key formats
Sami Tolvanen [Fri, 7 Nov 2014 04:38:00 +0000 (20:38 -0800)]
DO NOT MERGE: Change verity key formats
Change boot, recovery, and verity metadata signing keys to use the
same PKCS8 / X.509 PEM format as the other signing keys, and update
build scripts to use correct arguments for the updated signing
tools.
Bug:
15984840
Bug:
18120110
Change-Id: I23ed5a004ecdad6cf7696487935ad5031eb8adf8
(cherry picked from commit
72d90eb1895932343586717daa1865019473b2f5)
Greg Hartman [Tue, 11 Nov 2014 02:47:55 +0000 (02:47 +0000)]
Restore the diskinstaller dependency, since it\'s needed for GCE.
automerge:
2ebfef4
* commit '
2ebfef448465b99260b6900bc207d42ead09e96c':
Restore the diskinstaller dependency, since it's needed for GCE.
Greg Hartman [Tue, 11 Nov 2014 02:47:50 +0000 (02:47 +0000)]
Add a hook for the syslinux bootloader.
automerge:
4c46710
* commit '
4c46710e7a5cbcb1807d183aaeb88d68f98b6753':
Add a hook for the syslinux bootloader.
Greg Hartman [Wed, 5 Nov 2014 05:17:06 +0000 (21:17 -0800)]
Restore the diskinstaller dependency, since it's needed for GCE.
Change-Id: Ieb2695afbe551e829357bad56d5fe1501165b495
Greg Hartman [Fri, 31 Oct 2014 17:43:52 +0000 (10:43 -0700)]
Add a hook for the syslinux bootloader.
Change-Id: Ia8638e9dcb025743a66c52ad43b161ee70602c89