The Android Automerger
8708cdaf24
"LKY35B"
2015-02-04 06:07:39 -08:00
Ying Wang
7023f614e2
am 7245b4e2
: Support dpi specific aapt flags.
...
* commit '7245b4e2bed6cef8c6bf4cc67ffd98989fde3c91':
Support dpi specific aapt flags.
2015-01-30 19:34:22 +00:00
Ying Wang
7245b4e2be
Support dpi specific aapt flags.
...
With this support, you can set dpi-specific aapt flags like:
$(LOCAL_PACKAGE_NAME)_aapt_flags_hdpi := --version-code 100 \
--version-name "100
which will override the --version-code and --version-name set in the
base apk's LOCAL_AAPT_FLAGS.
Bug := 18388705
Change-Id: Ie79d7b1b6bbf7463bce51ddae04ba81384ec58dc
2015-01-30 02:17:52 +00:00
Ying Wang
7ecc76a0f2
Support dpi specific aapt flags.
...
With this support, you can set dpi-specific aapt flags like:
$(LOCAL_PACKAGE_NAME)_aapt_flags_hdpi := --version-code 100 \
--version-name "100
which will override the --version-code and --version-name set in the
base apk's LOCAL_AAPT_FLAGS.
Bug := 18388705
Change-Id: Ie79d7b1b6bbf7463bce51ddae04ba81384ec58dc
2015-01-29 18:08:00 -08:00
Jesse Zhao
fbc8c1454e
am 0c9384d5
: Merge "verify system and vendor image together before patching." into lmp-mr1-dev
...
* commit '0c9384d512cab94b761dcb82325e4411cbaf52c0':
verify system and vendor image together before patching.
2015-01-28 23:35:57 +00:00
Jesse Zhao
0c9384d512
Merge "verify system and vendor image together before patching." into lmp-mr1-dev
2015-01-28 23:30:54 +00:00
Ying Wang
1c1497a7f6
am cb73599b
: Make dangling module names in PRODUCT_FACTORY_RAMDISK_MODULES non-fatal.
...
* commit 'cb73599b25098b3513feda11ca5cb17d77fec83e':
Make dangling module names in PRODUCT_FACTORY_RAMDISK_MODULES non-fatal.
2015-01-28 00:00:09 +00:00
Ying Wang
cb73599b25
Make dangling module names in PRODUCT_FACTORY_RAMDISK_MODULES non-fatal.
...
It's pain to maintain an inactive product's list of
PRODUCT_FACTORY_RAMDISK_MODULES or PRODUCT_FACTORY_BUNDLE_MODULES.
Just show a warning if a module name becomes dangling.
Bug: 18779515
Change-Id: I3d137ed59feb005b186ed2a3519465da3d8f45c3
2015-01-27 15:49:21 -08:00
Ying Wang
f495c12557
am 507ea383
: Merge "Let apicheck check both the public API and system API." into lmp-mr1-dev
...
* commit '507ea383aaaea5634c79d20911773aa44324e7f5':
Let apicheck check both the public API and system API.
2015-01-22 20:41:09 +00:00
Ying Wang
507ea383aa
Merge "Let apicheck check both the public API and system API." into lmp-mr1-dev
2015-01-22 20:36:53 +00:00
Dirk Dougherty
d128388905
am 48141e05
: am 5a97f244
: am 529a107f
: Add new subtab under Distribute tab.
...
* commit '48141e05994ce939b2becab40d86482bda3d9090':
Add new subtab under Distribute tab.
2015-01-16 18:11:03 +00:00
Dirk Dougherty
48141e0599
am 5a97f244
: am 529a107f
: Add new subtab under Distribute tab.
...
* commit '5a97f24411df6ca7221343ac93f25decb99b6bea':
Add new subtab under Distribute tab.
2015-01-16 18:03:42 +00:00
Dirk Dougherty
5a97f24411
am 529a107f
: Add new subtab under Distribute tab.
...
* commit '529a107f9de5051b734fad4cecf1f971998aeade':
Add new subtab under Distribute tab.
2015-01-16 00:58:59 +00:00
Dirk Dougherty
529a107f9d
Add new subtab under Distribute tab.
...
Change-Id: I991c3295dea40629fdb9dde4a8ccbecad25f8136
2015-01-15 16:27:39 -08:00
Baligh Uddin
4117b4e3bd
am cda56ef6
: Fix default locale issue (cherry picked from commit 2a52f5c526
)
...
* commit 'cda56ef6da7216798f6791769f3e1f148bb119e2':
Fix default locale issue (cherry picked from commit 2a52f5c526
)
2015-01-12 04:07:49 +00:00
Baligh Uddin
cda56ef6da
Fix default locale issue
...
(cherry picked from commit 2a52f5c526
)
Change-Id: Ic59dd105d60c2dd44f60ed9f57b7e1381924080d
2015-01-11 23:10:44 +00:00
Ying Wang
668ae2506b
Let apicheck check both the public API and system API.
...
Also "make update-api" updates both public API and system API files.
Bug: 18960664
Change-Id: I35e805816e07c8aa4deaeb84b1611923583325e1
2015-01-09 14:23:16 -08:00
Jesse Zhao
75bcea0267
verify system and vendor image together before patching.
...
Change-Id: Ia43657ed6cd8860b0edb78cc2dd6388c761e1f8b
Bug: 17919909
2015-01-07 21:44:09 +00:00
Ying Wang
21a1f842c4
am 961096fa
: Remove ancient SDK cleanbuild rule
...
* commit '961096fadaccc38f38fb840ce621c2a1353b263c':
Remove ancient SDK cleanbuild rule
2015-01-07 02:06:27 +00:00
Ying Wang
961096fada
Remove ancient SDK cleanbuild rule
...
In anceint time we didn't have an "sdk" product so that we had to run
"make sdk" in a device product configuration.
Now we have SDK specific product configuration and we don't do "make
sdk" in device product configuration.
Change-Id: I40d58d51261498017bbe7e574c8128afc77e9b96
2015-01-06 16:49:20 -08:00
Jeff Arneson
35764d6f99
am ef789fa1
: am bb9eda64
: am 2ff97d99
: am d194c6ac
: Merge "Fix Documentation typo when showAnnotations is used with doclava" into lmp-docs
...
* commit 'ef789fa152d0a7649038b41b9ecf7adb1ad4d012':
Fix Documentation typo when showAnnotations is used with doclava
2015-01-06 02:18:22 +00:00
Jeff Arneson
ef789fa152
am bb9eda64
: am 2ff97d99
: am d194c6ac
: Merge "Fix Documentation typo when showAnnotations is used with doclava" into lmp-docs
...
* commit 'bb9eda64a300bbbeffc58798f9af04d332544557':
Fix Documentation typo when showAnnotations is used with doclava
2015-01-06 02:00:09 +00:00
smain@google.com
e6bf9dcde7
am 02be1804
: am fdb9fa0e
: am 351c908b
: am 94e0b530
: fix bug that allowed only one video in the shadowbox per page bug: 18777918
...
* commit '02be18043c1fe0a0109139caf65694a29035a1d2':
fix bug that allowed only one video in the shadowbox per page bug: 18777918
2014-12-19 17:15:30 +00:00
smain@google.com
fa963c7379
am 2fbb4e30
: am 39bac022
: am bfe3fc64
: am bf644aa5
: remove the Helpouts recruitment banner
...
* commit '2fbb4e30e26e7f3d3ec0e69075641d7343e04e13':
remove the Helpouts recruitment banner
2014-12-19 17:15:29 +00:00
smain@google.com
02be18043c
am fdb9fa0e
: am 351c908b
: am 94e0b530
: fix bug that allowed only one video in the shadowbox per page bug: 18777918
...
* commit 'fdb9fa0e2bdbcc8ffa6b33def29b74bab4ce91ac':
fix bug that allowed only one video in the shadowbox per page bug: 18777918
2014-12-19 17:08:33 +00:00
smain@google.com
2fbb4e30e2
am 39bac022
: am bfe3fc64
: am bf644aa5
: remove the Helpouts recruitment banner
...
* commit '39bac0222bf10bc9f7dd1f3d58391903d669d35a':
remove the Helpouts recruitment banner
2014-12-19 17:08:05 +00:00
Ying Wang
a1e09b1ae6
am 98ae7985
: Fix using variable intermediates.COMMON before defining.
...
* commit '98ae79853509bbc1b6ee66ace10295c5d29510c5':
Fix using variable intermediates.COMMON before defining.
2014-12-18 23:34:25 +00:00
Ying Wang
98ae798535
Fix using variable intermediates.COMMON before defining.
...
In commit e9dd9f2bf
we moved "include $(BUILD_SYSTEM)/android_manifest.mk"
forward before the variable intermediates.COMMON gets defined. That's a
mistake.
This change replaced the tentative variables
package_expected_intermediates_COMMON and guessed_intermediates with
their proper counterparts defined in base_rules.mk.
If their values differ in the two file, that's an error and we should
fix.
Bug: 18168693
Change-Id: I2bf17b0476b4a7f97810fbb0bde7630eb8878b53
2014-12-18 15:13:04 -08:00
Jeff Arneson
bb9eda64a3
am 2ff97d99
: am d194c6ac
: Merge "Fix Documentation typo when showAnnotations is used with doclava" into lmp-docs
...
* commit '2ff97d99266623997c09f5af937f98bc8bb2ee65':
Fix Documentation typo when showAnnotations is used with doclava
2014-12-18 17:05:23 +00:00
Jeff Arneson
2ff97d9926
am d194c6ac
: Merge "Fix Documentation typo when showAnnotations is used with doclava" into lmp-docs
...
* commit 'd194c6ac80007532596a614c86e3c68e129957e7':
Fix Documentation typo when showAnnotations is used with doclava
2014-12-18 17:00:15 +00:00
Jeff Arneson
d194c6ac80
Merge "Fix Documentation typo when showAnnotations is used with doclava" into lmp-docs
2014-12-18 16:50:13 +00:00
Ying Wang
81d110ea54
am 2902d458
: Add support for prebuilt AARs.
...
* commit '2902d4585f2a60a91084e96d00f2ee8d8301bf65':
Add support for prebuilt AARs.
2014-12-17 22:37:53 +00:00
Ying Wang
2902d4585f
Add support for prebuilt AARs.
...
- You can give a .aar as source file to a prebuilt static Java library
module. The build system will set up dependencies and rules to extract
classes.jar and other resource files.
- To build against a prebuilt AAR module, use:
LOCAL_STATIC_JAVA_AAR_LIBRARIES := <module names of aar prebuilt AARs>
The build system will set up rules to merge the library's
AndroidManifest.xml with the main AndroidManifest.xml, add the AAR's
resource dirs and link/merge the AAR's classes.jar.
Bug: 18168693
Change-Id: Ic2c1d20572a93bd98dbc72f8a39e26b459e442c2
(cherry picked from commit e9dd9f2bfc
)
2014-12-17 22:27:26 +00:00
smain@google.com
2ed92cda0d
am 19832ae1
: am d742274e
: am b05558cf
: am 3de83c1b
: make shadowbox video always centered to fit the window height
...
* commit '19832ae16afd9cf63e6fe02770d7bcee8a338f95':
make shadowbox video always centered to fit the window height
2014-12-17 20:27:00 +00:00
smain@google.com
19832ae16a
am d742274e
: am b05558cf
: am 3de83c1b
: make shadowbox video always centered to fit the window height
...
* commit 'd742274e14a048805a74311b0e5a25e03fc2465c':
make shadowbox video always centered to fit the window height
2014-12-17 20:20:20 +00:00
smain@google.com
fdb9fa0e2b
am 351c908b
: am 94e0b530
: fix bug that allowed only one video in the shadowbox per page bug: 18777918
...
* commit '351c908b757fcfee03d5f15b4a29cb9a48f93f46':
fix bug that allowed only one video in the shadowbox per page bug: 18777918
2014-12-17 03:31:06 +00:00
smain@google.com
351c908b75
am 94e0b530
: fix bug that allowed only one video in the shadowbox per page bug: 18777918
...
* commit '94e0b530868c56547ee05e84534fa68a1f6346f7':
fix bug that allowed only one video in the shadowbox per page bug: 18777918
2014-12-17 03:25:14 +00:00
smain@google.com
94e0b53086
fix bug that allowed only one video in the shadowbox per page
...
bug: 18777918
Change-Id: I07c75f795128165e2f1472112cf8ba1a1ee782c7
2014-12-16 19:07:08 -08:00
Jeff Arneson
c6e8a05f49
Fix Documentation typo when showAnnotations is used with doclava
...
Bug: 18711752
Change-Id: I1b5fce05063733388f65a6ddddf2522ea14e9e5f
2014-12-16 23:13:40 +00:00
smain@google.com
39bac0222b
am bfe3fc64
: am bf644aa5
: remove the Helpouts recruitment banner
...
* commit 'bfe3fc64add62518b619a052193269d3281475b9':
remove the Helpouts recruitment banner
2014-12-16 18:20:31 +00:00
smain@google.com
bfe3fc64ad
am bf644aa5
: remove the Helpouts recruitment banner
...
* commit 'bf644aa564263120fdc61a2578aa2466fbc1d55a':
remove the Helpouts recruitment banner
2014-12-16 18:13:09 +00:00
smain@google.com
bf644aa564
remove the Helpouts recruitment banner
...
Change-Id: Iea8e241c24964dd76315a0dc0585f0c23841f650
2014-12-16 10:05:03 -08:00
Joe Fernandez
6437b637d1
am 5576ef5b
: am b96b2a4a
: am 91f2ba64
: am a4417712
: Merge "docs: SHA update in sdkpage.cs" into lmp-docs
...
* commit '5576ef5b7162ca156456b87939964361da88cec6':
docs: SHA update in sdkpage.cs
2014-12-16 03:48:14 +00:00
smain@google.com
7d4e6bbe83
am 96ac360b
: am 2881d6f3
: am 9f88a60d
: am 481f15c1
: set youtube player lang based on user pref and enable captions when not English
...
* commit '96ac360b399d073e0764759bf53973bebd8da66b':
set youtube player lang based on user pref and enable captions when not English
2014-12-16 03:48:13 +00:00
smain@google.com
5b566fb929
am 8f207ca0
: am 2c3ae43f
: am 29e06142
: am d24088c0
: add analytics event to track from which page a video was started
...
* commit '8f207ca0460c7df2f5ce3b5005312e945c4e48e2':
add analytics event to track from which page a video was started
2014-12-16 03:48:12 +00:00
smain@google.com
08810fc42c
am 305f55cd
: am 3ff2fd14
: am d7dbaf5c
: am ed677d7a
: update analytics event for searches to make query case-insensitive and save the URL instead of doc title.
...
* commit '305f55cd29c37b048083b97ddcae2894a0325c6c':
update analytics event for searches to make query case-insensitive and save the URL instead of doc title.
2014-12-16 03:48:11 +00:00
Joe Fernandez
5576ef5b71
am b96b2a4a
: am 91f2ba64
: am a4417712
: Merge "docs: SHA update in sdkpage.cs" into lmp-docs
...
* commit 'b96b2a4ae621e1bd8529ef50bc00ddc048207ca3':
docs: SHA update in sdkpage.cs
2014-12-16 03:42:03 +00:00
smain@google.com
96ac360b39
am 2881d6f3
: am 9f88a60d
: am 481f15c1
: set youtube player lang based on user pref and enable captions when not English
...
* commit '2881d6f31b9daf9a3d701671eae3297040d84799':
set youtube player lang based on user pref and enable captions when not English
2014-12-16 03:41:58 +00:00
smain@google.com
8f207ca046
am 2c3ae43f
: am 29e06142
: am d24088c0
: add analytics event to track from which page a video was started
...
* commit '2c3ae43f9e8329d7f0c24192fe1fd400d1a870b2':
add analytics event to track from which page a video was started
2014-12-16 03:40:27 +00:00
smain@google.com
305f55cd29
am 3ff2fd14
: am d7dbaf5c
: am ed677d7a
: update analytics event for searches to make query case-insensitive and save the URL instead of doc title.
...
* commit '3ff2fd14b1276e3b9c0473bd987c1bb34925ef86':
update analytics event for searches to make query case-insensitive and save the URL instead of doc title.
2014-12-16 03:39:31 +00:00