OSDN Git Service
Qiwen Zhao [Fri, 19 Sep 2014 08:29:24 +0000 (08:29 +0000)]
am
d542afcb: Merge commit \'
e866294e\' into lmp-mr1-dev-plus-aosp
* commit '
d542afcb931850a87c2d151859bd184047be0b8d':
David 'Digit' Turner [Fri, 19 Sep 2014 07:39:22 +0000 (07:39 +0000)]
am
d76f466f: am
d0367114: Merge "envsetup.sh: Fix handling of emulator prebuilts path." into lmp-dev
* commit '
d76f466f89d14000001f94076ab35e76fd82af16':
Ying Wang [Fri, 19 Sep 2014 07:18:07 +0000 (07:18 +0000)]
am
68ce34e8: am
7a899199: Enable multilib odex only if TARGET_2ND_ARCH is defined.
* commit '
68ce34e87213f4333c46efa65557f9b4f739748e':
Ying Wang [Fri, 19 Sep 2014 04:52:40 +0000 (04:52 +0000)]
am
752e6bca: am
e085cdda: am
88cfa032: Merge "Enable multilib odex only if TARGET_2ND_ARCH is defined."
* commit '
752e6bcaad5b7c9b068f0b9bffa9e497268324ad':
Ying Wang [Fri, 19 Sep 2014 04:52:37 +0000 (04:52 +0000)]
am
04f65770: am
66ee934c: am
8209d993: Merge "Support to build apk odex for both arch."
* commit '
04f6577000e572c480d606168d1c86816f111026':
Qiwen Zhao [Thu, 18 Sep 2014 19:36:26 +0000 (19:36 +0000)]
am
5726fec5: Merge commit \'
e866294e\' into lmp-dev-plus-aosp
* commit '
5726fec5308764c6d4f34fb4fc8b388d567fef2d':
Docs: Replacing s.a.c. Android logo to match other sites.
Qiwen Zhao [Thu, 18 Sep 2014 19:21:48 +0000 (12:21 -0700)]
Merge commit '
e866294e' into lmp-mr1-dev-plus-aosp
Conflicts:
tools/droiddoc/templates-sac/assets/images/sac_logo.png
Qiwen Zhao [Thu, 18 Sep 2014 19:19:51 +0000 (12:19 -0700)]
Merge commit '
e866294e' into lmp-dev-plus-aosp
Conflicts:
tools/droiddoc/templates-sac/assets/images/sac_logo.png
Clay Murphy [Thu, 18 Sep 2014 18:33:13 +0000 (18:33 +0000)]
am
ef3148c1: Merge "Docs: Replacing s.a.c. Android logo to match other sites."
* commit '
ef3148c1fa2173a6ed5c4f7a02955acddf88d6ac':
Docs: Replacing s.a.c. Android logo to match other sites.
Clay Murphy [Thu, 18 Sep 2014 18:26:58 +0000 (18:26 +0000)]
Merge "Docs: Replacing s.a.c. Android logo to match other sites."
Clay Murphy [Tue, 24 Jun 2014 18:32:56 +0000 (11:32 -0700)]
Docs: Replacing s.a.c. Android logo to match other sites.
Bug:
15408415
Change-Id: I9bdb294f3ff0c5aaf766b4ead79ad9614f9dbd89
David 'Digit' Turner [Wed, 17 Sep 2014 14:11:37 +0000 (14:11 +0000)]
am
d0367114: Merge "envsetup.sh: Fix handling of emulator prebuilts path." into lmp-dev
* commit '
d036711427ff7ecbf603b51e04c75986504138d9':
envsetup.sh: Fix handling of emulator prebuilts path.
Przemyslaw Szczepaniak [Wed, 17 Sep 2014 13:14:59 +0000 (13:14 +0000)]
Merge "Switch NDK libraries to 4.9 for x86_64 and mips64"
David 'Digit' Turner [Tue, 16 Sep 2014 21:46:39 +0000 (21:46 +0000)]
am
dbf03f09: am
d0367114: Merge "envsetup.sh: Fix handling of emulator prebuilts path." into lmp-dev
* commit '
dbf03f09de16f625a9ae2bdc42e5d1536d2987b6':
envsetup.sh: Fix handling of emulator prebuilts path.
David 'Digit' Turner [Tue, 16 Sep 2014 21:34:33 +0000 (21:34 +0000)]
am
d0367114: Merge "envsetup.sh: Fix handling of emulator prebuilts path." into lmp-dev
* commit '
d036711427ff7ecbf603b51e04c75986504138d9':
envsetup.sh: Fix handling of emulator prebuilts path.
Ying Wang [Tue, 16 Sep 2014 21:06:01 +0000 (21:06 +0000)]
am
7a899199: Enable multilib odex only if TARGET_2ND_ARCH is defined.
* commit '
7a8991991f6459945782175b0cda7d03fbf6cbde':
Enable multilib odex only if TARGET_2ND_ARCH is defined.
David 'Digit' Turner [Tue, 16 Sep 2014 19:33:36 +0000 (19:33 +0000)]
Merge "envsetup.sh: Fix handling of emulator prebuilts path." into lmp-dev
David 'Digit' Turner [Tue, 16 Sep 2014 19:33:26 +0000 (19:33 +0000)]
Merge "envsetup.sh: Fix handling of emulator prebuilts path."
David 'Digit' Turner [Tue, 16 Sep 2014 19:23:12 +0000 (21:23 +0200)]
envsetup.sh: Fix handling of emulator prebuilts path.
Due to a bad previous merge, everytime 'lunch' is called, a new
instance of prebuilts/android-emulator/<system>/ will be added
to your PATH.
This patch fixes the issue by removing the duplicate code that
should have been removed during the merge. Note that android-emulator
is still being added once to the PATH by code that appears before
in the script.
BUG=
17524154
Change-Id: Ic281f71ad640e52d744f968f5c02b428cf6310dc
David 'Digit' Turner [Tue, 16 Sep 2014 19:23:12 +0000 (21:23 +0200)]
envsetup.sh: Fix handling of emulator prebuilts path.
Due to a bad previous merge, everytime 'lunch' is called, a new
instance of prebuilts/android-emulator/<system>/ will be added
to your PATH.
This patch fixes the issue by removing the duplicate code that
should have been removed during the merge. Note that android-emulator
is still being added once to the PATH by code that appears before
in the script.
BUG=
17524154
Change-Id: Iaa03159b0c81b15ef4c7c420e2f76e0a48aba789
Ying Wang [Tue, 16 Sep 2014 17:20:43 +0000 (17:20 +0000)]
am
b45c33cd: am
e085cdda: am
88cfa032: Merge "Enable multilib odex only if TARGET_2ND_ARCH is defined."
* commit '
b45c33cd0cc49f4d463e9414d7c653508e9aa875':
Enable multilib odex only if TARGET_2ND_ARCH is defined.
Ying Wang [Tue, 16 Sep 2014 17:20:41 +0000 (17:20 +0000)]
am
fb7978a6: am
66ee934c: (-s ours) am
8209d993: Merge "Support to build apk odex for both arch."
* commit '
fb7978a6d4595eb5639a7fe4c5fd88d5a71fe51c':
Support to build apk odex for both arch.
Ying Wang [Tue, 16 Sep 2014 17:08:41 +0000 (17:08 +0000)]
am
e085cdda: am
88cfa032: Merge "Enable multilib odex only if TARGET_2ND_ARCH is defined."
* commit '
e085cdda0ace500c511b75bcf6c9aa06fbb18050':
Enable multilib odex only if TARGET_2ND_ARCH is defined.
Ying Wang [Tue, 16 Sep 2014 17:08:40 +0000 (17:08 +0000)]
am
66ee934c: (-s ours) am
8209d993: Merge "Support to build apk odex for both arch."
* commit '
66ee934c917686cf6ca9caf57c59b038cb212c17':
Support to build apk odex for both arch.
Przemyslaw Szczepaniak [Tue, 16 Sep 2014 14:17:47 +0000 (15:17 +0100)]
Switch NDK libraries to 4.9 for x86_64 and mips64
Android NDK r10b doesn't even provide 4.8 for those
archs.
Change-Id: I10840c6c7bbc0dd9028a794162d021d8b3e6b19a
Ying Wang [Tue, 16 Sep 2014 08:53:20 +0000 (08:53 +0000)]
am
e7296eb2: am
7a899199: Enable multilib odex only if TARGET_2ND_ARCH is defined.
* commit '
e7296eb23fd43aec155dc857e6ee2bc3875cf340':
Enable multilib odex only if TARGET_2ND_ARCH is defined.
Ying Wang [Tue, 16 Sep 2014 08:50:00 +0000 (08:50 +0000)]
am
e085cdda: am
88cfa032: Merge "Enable multilib odex only if TARGET_2ND_ARCH is defined."
* commit '
e085cdda0ace500c511b75bcf6c9aa06fbb18050':
Enable multilib odex only if TARGET_2ND_ARCH is defined.
Ying Wang [Tue, 16 Sep 2014 08:49:58 +0000 (08:49 +0000)]
am
66ee934c: am
8209d993: Merge "Support to build apk odex for both arch."
* commit '
66ee934c917686cf6ca9caf57c59b038cb212c17':
Support to build apk odex for both arch.
Ying Wang [Tue, 16 Sep 2014 08:32:18 +0000 (08:32 +0000)]
am
7a899199: Enable multilib odex only if TARGET_2ND_ARCH is defined.
* commit '
7a8991991f6459945782175b0cda7d03fbf6cbde':
Enable multilib odex only if TARGET_2ND_ARCH is defined.
Ying Wang [Tue, 16 Sep 2014 08:22:27 +0000 (08:22 +0000)]
am
88cfa032: Merge "Enable multilib odex only if TARGET_2ND_ARCH is defined."
* commit '
88cfa0324724c7e90bfed3aaa61c27ca0926860b':
Enable multilib odex only if TARGET_2ND_ARCH is defined.
Ying Wang [Tue, 16 Sep 2014 08:22:26 +0000 (08:22 +0000)]
am
8209d993: Merge "Support to build apk odex for both arch."
* commit '
8209d993da63dcf3ac6b3e9d236e2baf0fcd51a0':
Support to build apk odex for both arch.
Ying Wang [Mon, 15 Sep 2014 19:14:20 +0000 (19:14 +0000)]
Merge "Enable multilib odex only if TARGET_2ND_ARCH is defined."
Ying Wang [Mon, 15 Sep 2014 19:14:15 +0000 (19:14 +0000)]
Merge "Support to build apk odex for both arch."
Ying Wang [Mon, 15 Sep 2014 18:45:52 +0000 (11:45 -0700)]
Enable multilib odex only if TARGET_2ND_ARCH is defined.
Bug:
17507247
Bug:
14694978
Change-Id: I160a37bc0970315054606829aa112b67eaee7d49
Ying Wang [Sat, 13 Sep 2014 18:26:39 +0000 (11:26 -0700)]
Support to build apk odex for both arch.
Build odex for both arch in multilib build if an app has
LOCAL_MULTILIB := both.
Refactored the common setup code to a separate file setup_one_odex.mk.
Bug:
17409149
Bug:
14694978
Change-Id: I74c9426cd74fe0b0cb4811368f740a88ac2ae022
Ying Wang [Mon, 15 Sep 2014 18:45:52 +0000 (11:45 -0700)]
Enable multilib odex only if TARGET_2ND_ARCH is defined.
Bug:
17507247
Bug:
14694978
Change-Id: I160a37bc0970315054606829aa112b67eaee7d49
Ying Wang [Sun, 14 Sep 2014 21:31:24 +0000 (21:31 +0000)]
am
55927b06: am
ce851e88: Merge "Support to build apk odex for both arch." into lmp-dev
* commit '
55927b066843ba0396593f557a5fd6c3287580c6':
Support to build apk odex for both arch.
Ying Wang [Sun, 14 Sep 2014 21:15:57 +0000 (21:15 +0000)]
am
ce851e88: Merge "Support to build apk odex for both arch." into lmp-dev
* commit '
ce851e88d9b1a0d934f1a564b3a400782d12e0d3':
Support to build apk odex for both arch.
Ying Wang [Sun, 14 Sep 2014 20:49:13 +0000 (20:49 +0000)]
Merge "Support to build apk odex for both arch." into lmp-dev
Ying Wang [Sat, 13 Sep 2014 18:26:39 +0000 (11:26 -0700)]
Support to build apk odex for both arch.
Build odex for both arch in multilib build if an app has
LOCAL_MULTILIB := both.
Refactored the common setup code to a separate file setup_one_odex.mk.
Bug:
17409149
Bug:
14694978
Change-Id: I74c9426cd74fe0b0cb4811368f740a88ac2ae022
Tyler Gunn [Sat, 13 Sep 2014 18:19:39 +0000 (18:19 +0000)]
am
260abc8a: am
6156bcad: Renaming Telecomm to Telecom.
* commit '
260abc8a1079bb3504c42543c3b3824414774cef':
Renaming Telecomm to Telecom.
Tyler Gunn [Sat, 13 Sep 2014 18:03:13 +0000 (18:03 +0000)]
am
6156bcad: Renaming Telecomm to Telecom.
* commit '
6156bcad42b8a08dcf41b7cb12be90d2c6d02cf5':
Renaming Telecomm to Telecom.
Tyler Gunn [Fri, 12 Sep 2014 16:19:59 +0000 (09:19 -0700)]
Renaming Telecomm to Telecom.
- Changing reference from Telecomm to Telecom.
Bug:
17364651
Change-Id: I5b7200396dfc5f0d4c62f9a1aa50bd4fdc04fccf
Brian Carlstrom [Sat, 13 Sep 2014 02:25:36 +0000 (02:25 +0000)]
am
1ac92695: am
f70dcab1: am
c3aeddd3: Merge "Fix mma/mmma by making gettop canonicalize TOP when set"
* commit '
1ac92695c28301dab478635bc50f7fc9c1932e84':
Fix mma/mmma by making gettop canonicalize TOP when set
Jeff Arneson [Sat, 13 Sep 2014 02:20:26 +0000 (02:20 +0000)]
am
3b62f196: am
faa1dc5c: Merge "Show annotation information for fields, enums, etc. and in the class list" into lmp-dev
* commit '
3b62f196e161afd4768c828fd9c582a25ab6d87e':
Show annotation information for fields, enums, etc. and in the class list
Brian Carlstrom [Fri, 12 Sep 2014 22:47:03 +0000 (22:47 +0000)]
am
f70dcab1: am
c3aeddd3: Merge "Fix mma/mmma by making gettop canonicalize TOP when set"
* commit '
f70dcab1bf313f02e9a3bea0d1bf75ce28457776':
Fix mma/mmma by making gettop canonicalize TOP when set
Brian Carlstrom [Fri, 12 Sep 2014 22:29:00 +0000 (22:29 +0000)]
am
c3aeddd3: Merge "Fix mma/mmma by making gettop canonicalize TOP when set"
* commit '
c3aeddd331a62ebe7a4d6d6e5892cbe35222d6e7':
Fix mma/mmma by making gettop canonicalize TOP when set
Brian Carlstrom [Fri, 12 Sep 2014 22:18:11 +0000 (22:18 +0000)]
Merge "Fix mma/mmma by making gettop canonicalize TOP when set"
Brian Carlstrom [Fri, 12 Sep 2014 19:29:15 +0000 (19:29 +0000)]
am
16b5cd83: am
0c837a09: Merge "Fix mma/mmma by making gettop canonicalize TOP when set" into lmp-dev
* commit '
16b5cd832fe628cd2a885a6ceed5981cdb4522f5':
Fix mma/mmma by making gettop canonicalize TOP when set
Esteban Talavera [Fri, 12 Sep 2014 19:29:12 +0000 (19:29 +0000)]
am
f69ff0e0: am
aaaf5025: Merge "Added new \'adb dpm\' command to the packages list." into lmp-dev
* commit '
f69ff0e07f7953a382f6e4f37ad063bf7179f24d':
Added new 'adb dpm' command to the packages list.
Ying Wang [Fri, 12 Sep 2014 19:21:51 +0000 (19:21 +0000)]
am
6d30b05e: am
5ae4286b: Merge "Conditionally skip boot jars package name check." into lmp-dev
* commit '
6d30b05e0ec6d81161ba57517a9f6356c46af1ff':
Conditionally skip boot jars package name check.
Raphael Moll [Fri, 12 Sep 2014 19:21:50 +0000 (19:21 +0000)]
am
fac49734: am
24494187: Merge "SDK Addon multi-sys-img support, part 4." into lmp-dev
* commit '
fac497340f8f31a76e30c9b816fb9e83ff82e301':
SDK Addon multi-sys-img support, part 4.
Dan Albert [Fri, 12 Sep 2014 19:21:49 +0000 (19:21 +0000)]
am
9b0a5cb8: am
66927151: Missed one part of removing the vbox target.
* commit '
9b0a5cb8614423ffd6a4aad13b91d39ab52b8a33':
Missed one part of removing the vbox target.
Dan Albert [Fri, 12 Sep 2014 19:21:49 +0000 (19:21 +0000)]
am
46be31aa: am
b7af531e: Remove the vbox target from the build system.
* commit '
46be31aa26a8d888db70ce053ddc5f2f2151b854':
Remove the vbox target from the build system.
Jeff Arneson [Fri, 12 Sep 2014 19:20:17 +0000 (19:20 +0000)]
am
faa1dc5c: Merge "Show annotation information for fields, enums, etc. and in the class list" into lmp-dev
* commit '
faa1dc5c016c18bb7e224bb7f16f41989d1d7c23':
Show annotation information for fields, enums, etc. and in the class list
Ying Wang [Fri, 12 Sep 2014 19:18:09 +0000 (19:18 +0000)]
am
b0914120: am
48c37182: Merge "Check PRODUCT_BOOT_JARS against a whitelist of package names." into lmp-dev
* commit '
b0914120830d7624697efc084b75d5cbe2ebb5cd':
Check PRODUCT_BOOT_JARS against a whitelist of package names.
Doug Zongker [Fri, 12 Sep 2014 19:18:08 +0000 (19:18 +0000)]
am
f0c58d81: am
b34fcce0: explicitly check the superblock for differences
* commit '
f0c58d81353a08678422b0819a07bbaa0accc110':
explicitly check the superblock for differences
Brian Carlstrom [Fri, 12 Sep 2014 18:53:26 +0000 (18:53 +0000)]
am
0c837a09: Merge "Fix mma/mmma by making gettop canonicalize TOP when set" into lmp-dev
* commit '
0c837a093e9c6952885ef370a34b82213f12300c':
Fix mma/mmma by making gettop canonicalize TOP when set
Esteban Talavera [Fri, 12 Sep 2014 18:53:25 +0000 (18:53 +0000)]
am
aaaf5025: Merge "Added new \'adb dpm\' command to the packages list." into lmp-dev
* commit '
aaaf5025b6ecca2815d32c0c78557686b68baac6':
Added new 'adb dpm' command to the packages list.
Jeff Arneson [Fri, 12 Sep 2014 18:24:59 +0000 (18:24 +0000)]
Merge "Show annotation information for fields, enums, etc. and in the class list" into lmp-dev
Brian Carlstrom [Fri, 12 Sep 2014 07:33:25 +0000 (00:33 -0700)]
Fix mma/mmma by making gettop canonicalize TOP when set
Bug:
17253957
(cherry picked from commit
a5c4f178ae3f3e94b1d1dceae3cc8d3196633c4a)
Change-Id: Id5f5a6e9c81d4332ef5a846423ea41384a053db6
Brian Carlstrom [Fri, 12 Sep 2014 16:36:20 +0000 (16:36 +0000)]
Merge "Fix mma/mmma by making gettop canonicalize TOP when set" into lmp-dev
Esteban Talavera [Fri, 12 Sep 2014 10:35:47 +0000 (10:35 +0000)]
Merge "Added new 'adb dpm' command to the packages list." into lmp-dev
Brian Carlstrom [Fri, 12 Sep 2014 07:33:25 +0000 (00:33 -0700)]
Fix mma/mmma by making gettop canonicalize TOP when set
Bug:
17253957
Change-Id: Ifd6d5984f63981e1f99b6ae6f9459c2801588459
Ying Wang [Fri, 12 Sep 2014 05:43:07 +0000 (05:43 +0000)]
am
5ae4286b: Merge "Conditionally skip boot jars package name check." into lmp-dev
* commit '
5ae4286b94813171982ff7fdebe88fd29fe7e590':
Conditionally skip boot jars package name check.
Raphael Moll [Fri, 12 Sep 2014 05:43:06 +0000 (05:43 +0000)]
am
24494187: Merge "SDK Addon multi-sys-img support, part 4." into lmp-dev
* commit '
24494187def3472dca81db6ae782c7d1246c1056':
SDK Addon multi-sys-img support, part 4.
Dan Albert [Fri, 12 Sep 2014 05:43:05 +0000 (05:43 +0000)]
am
66927151: Missed one part of removing the vbox target.
* commit '
6692715135b38ec24f8f22e0219737f7d3fadbc2':
Missed one part of removing the vbox target.
Dan Albert [Fri, 12 Sep 2014 05:43:04 +0000 (05:43 +0000)]
am
b7af531e: Remove the vbox target from the build system.
* commit '
b7af531ecc9ccd8f2fe3344429536d6a5b32218a':
Remove the vbox target from the build system.
Ying Wang [Fri, 12 Sep 2014 01:15:55 +0000 (01:15 +0000)]
Merge "Conditionally skip boot jars package name check." into lmp-dev
Ying Wang [Fri, 12 Sep 2014 00:40:29 +0000 (17:40 -0700)]
Conditionally skip boot jars package name check.
In PDK build, or when a product adds its own boot jars we skip the
check.
Bug:
17434570
Change-Id: I9096ebfa38280c5d2ca84bdc489b455876103f5d
Raphael Moll [Thu, 11 Sep 2014 22:28:40 +0000 (22:28 +0000)]
Merge "SDK Addon multi-sys-img support, part 4." into lmp-dev
Dan Albert [Wed, 10 Sep 2014 22:58:20 +0000 (15:58 -0700)]
Missed one part of removing the vbox target.
Change-Id: I8edb5252b5e71de042b79cb9eb2a497d89efb773
(cherry picked from commit
bfbd41edcb2b092cd27bc57647f4d53de0b0df54)
Dan Albert [Wed, 10 Sep 2014 22:10:31 +0000 (15:10 -0700)]
Remove the vbox target from the build system.
I've been told this is no longer in use, and it's the only user of
external/grub, which is distressingly out of date.
Change-Id: I434a55e0d68f6db97fa71e294e983ff1802e9ba6
(cherry picked from commit
de21059acf371a58019ef02aa79457923750aa79)
Ying Wang [Thu, 11 Sep 2014 18:32:38 +0000 (18:32 +0000)]
am
48c37182: Merge "Check PRODUCT_BOOT_JARS against a whitelist of package names." into lmp-dev
* commit '
48c37182f0df4ace331d7b546c7840ef67b13883':
Check PRODUCT_BOOT_JARS against a whitelist of package names.
Doug Zongker [Thu, 11 Sep 2014 18:30:54 +0000 (18:30 +0000)]
am
b34fcce0: explicitly check the superblock for differences
* commit '
b34fcce08cc9ab358481e672d83ff16513c4ac37':
explicitly check the superblock for differences
Ying Wang [Thu, 11 Sep 2014 18:06:51 +0000 (18:06 +0000)]
Merge "Check PRODUCT_BOOT_JARS against a whitelist of package names." into lmp-dev
Jeff Arneson [Thu, 11 Sep 2014 00:20:33 +0000 (17:20 -0700)]
Show annotation information for fields, enums, etc. and in the class list
Add the "Included in documentation due to annotations..." text for
fields, enum constants, and pretty much everything with a description.
Added annotation text to eh classes.cs file used to generate the
class list page.
Change-Id: I2685d1a34fa292088c03ccd76f2627fe954c9000
Dan Albert [Thu, 11 Sep 2014 17:28:49 +0000 (17:28 +0000)]
am
588011a9: am
5f8e7ff6: am
1feb478d: Merge "Missed one part of removing the vbox target."
* commit '
588011a9051eb336a3d562be294f70098741221a':
Missed one part of removing the vbox target.
Jeff Arneson [Thu, 11 Sep 2014 17:27:12 +0000 (17:27 +0000)]
am
99100165: am
0052f75f: Merge "Make the text generated by showAnnotations more noticable in docs" into lmp-dev
* commit '
9910016592663b25d607e6794b2b83bdb7787ce0':
Make the text generated by showAnnotations more noticable in docs
Ying Wang [Thu, 11 Sep 2014 17:26:22 +0000 (17:26 +0000)]
am
634e7df1: am
acaada12: Use existing my_32_64_bit_suffix.
* commit '
634e7df1c88997a787fb502a5e616eba9588dcc5':
Use existing my_32_64_bit_suffix.
Dan Albert [Thu, 11 Sep 2014 17:26:01 +0000 (17:26 +0000)]
am
38dc420e: resolved conflicts for merge of
fa21f9db to lmp-dev-plus-aosp
* commit '
38dc420e19a77e22c49fb568561fb697a91143cd':
Remove the vbox target from the build system.
Tim Murray [Thu, 11 Sep 2014 17:25:45 +0000 (17:25 +0000)]
am
c0bdd15b: am
fabd3c00: Merge "Pass -m32 or -m64 to llvm-rs-cc when reflecting C++." into lmp-dev
* commit '
c0bdd15b10401b7bf2e1b5acf30e06e7f2d5800c':
Pass -m32 or -m64 to llvm-rs-cc when reflecting C++.
Ian Rogers [Thu, 11 Sep 2014 17:22:29 +0000 (17:22 +0000)]
am
ba5d7a59: am
f0d5324f: Merge "Refine TARGET_GLOBAL_CFLAGS for x86 and x86_64:" into lmp-dev
* commit '
ba5d7a59b5910430a8b3b89fd4a5a5f14c56236b':
Refine TARGET_GLOBAL_CFLAGS for x86 and x86_64:
Esteban Talavera [Thu, 11 Sep 2014 16:52:08 +0000 (17:52 +0100)]
Added new 'adb dpm' command to the packages list.
Bug:
17312478,
17316711
Change-Id: I2613178ea82a6c6268e7f8012e74c4a852fea0d4
Doug Zongker [Thu, 11 Sep 2014 16:34:56 +0000 (09:34 -0700)]
explicitly check the superblock for differences
When generating incrementals for the system and vendor partitions,
check the first block (which contains the superblock) of the partition
to see if it's what we expect. If this check fails, give an explicit
log message about the partition having been remounted R/W (the most
likely explanation) and the need to flash to get OTAs working again.
Bug:
17393999
Change-Id: I2093807cbc2ec87c8b29ac46365f91f59b15c2ae
Doug Zongker [Thu, 11 Sep 2014 16:34:56 +0000 (09:34 -0700)]
explicitly check the superblock for differences
When generating incrementals for the system and vendor partitions,
check the first block (which contains the superblock) of the partition
to see if it's what we expect. If this check fails, give an explicit
log message about the partition having been remounted R/W (the most
likely explanation) and the need to flash to get OTAs working again.
Bug:
17393999
Change-Id: Ifd2132b428dbc4907527291712690204a3664ac0
Ying Wang [Thu, 11 Sep 2014 14:14:23 +0000 (14:14 +0000)]
am
a33c6151: am
ecc28e95: am
48505328: Merge "Refine TARGET_GLOBAL_CFLAGS for x86 and x86_64:"
* commit '
a33c6151b0d714dd5d57691ae06abef77a4b67e4':
Refine TARGET_GLOBAL_CFLAGS for x86 and x86_64:
Dan Albert [Thu, 11 Sep 2014 02:54:57 +0000 (02:54 +0000)]
am
5f8e7ff6: am
1feb478d: Merge "Missed one part of removing the vbox target."
* commit '
5f8e7ff67602a1ac14994c4aad6fd5d194b68d57':
Missed one part of removing the vbox target.
Dan Albert [Thu, 11 Sep 2014 01:42:49 +0000 (01:42 +0000)]
am
1feb478d: Merge "Missed one part of removing the vbox target."
* commit '
1feb478d28cfb427650e4cd2752bcd988b3258e6':
Missed one part of removing the vbox target.
Dan Albert [Thu, 11 Sep 2014 01:32:05 +0000 (01:32 +0000)]
Merge "Missed one part of removing the vbox target."
Jeff Arneson [Thu, 11 Sep 2014 00:23:00 +0000 (00:23 +0000)]
am
0052f75f: Merge "Make the text generated by showAnnotations more noticable in docs" into lmp-dev
* commit '
0052f75f88abbe4d16ff3b921be78b848fd4f6f9':
Make the text generated by showAnnotations more noticable in docs
Jeff Arneson [Thu, 11 Sep 2014 00:02:22 +0000 (00:02 +0000)]
Merge "Make the text generated by showAnnotations more noticable in docs" into lmp-dev
Ying Wang [Wed, 10 Sep 2014 23:32:46 +0000 (23:32 +0000)]
am
acaada12: Use existing my_32_64_bit_suffix.
* commit '
acaada12731639e3feba1dd83d7e44765ec8556c':
Use existing my_32_64_bit_suffix.
Dan Albert [Wed, 10 Sep 2014 23:15:18 +0000 (16:15 -0700)]
resolved conflicts for merge of
fa21f9db to lmp-dev-plus-aosp
Change-Id: I8cd590e7e6f764d6651dcaacd4beb8c72a23164f
Ying Wang [Wed, 10 Sep 2014 23:11:41 +0000 (16:11 -0700)]
Use existing my_32_64_bit_suffix.
Change-Id: I75d9733870c37a44ce55ae6cbcfb3f67e1387e9d
Tim Murray [Wed, 10 Sep 2014 22:58:37 +0000 (22:58 +0000)]
am
fabd3c00: Merge "Pass -m32 or -m64 to llvm-rs-cc when reflecting C++." into lmp-dev
* commit '
fabd3c00b461c921cb745acd62e7b07b4e938241':
Pass -m32 or -m64 to llvm-rs-cc when reflecting C++.
Dan Albert [Wed, 10 Sep 2014 22:58:20 +0000 (15:58 -0700)]
Missed one part of removing the vbox target.
Change-Id: I8edb5252b5e71de042b79cb9eb2a497d89efb773
Dan Albert [Wed, 10 Sep 2014 22:39:26 +0000 (22:39 +0000)]
am
30dbfce5: Merge "Remove the vbox target from the build system."
* commit '
30dbfce52fdf3ec554b1818ac40fea734e8eac3f':
Remove the vbox target from the build system.
Tim Murray [Wed, 10 Sep 2014 22:35:58 +0000 (22:35 +0000)]
Merge "Pass -m32 or -m64 to llvm-rs-cc when reflecting C++." into lmp-dev
Dan Albert [Wed, 10 Sep 2014 22:31:41 +0000 (22:31 +0000)]
Merge "Remove the vbox target from the build system."