OSDN Git Service
Ying Wang [Wed, 24 Sep 2014 17:50:44 +0000 (17:50 +0000)]
am
a47420a2: Break package-modules build recipe to mutliple lines
* commit '
a47420a22d83fb5707cb971d98961f87e667ffe8':
Break package-modules build recipe to mutliple lines
Ying Wang [Wed, 24 Sep 2014 04:50:12 +0000 (21:50 -0700)]
Break package-modules build recipe to mutliple lines
To fix "Argument list too long" error seen on some machines.
Change-Id: I6f34668e938412751e257b4b543358e1fc0809a1
Dan Albert [Wed, 24 Sep 2014 16:42:39 +0000 (09:42 -0700)]
resolved conflicts for merge of
326f9450 to lmp-dev-plus-aosp
Change-Id: I66360da623a6e7ac04610c3252f24ed69f7e4b1e
Dan Albert [Wed, 24 Sep 2014 16:13:18 +0000 (16:13 +0000)]
am
33029248: Merge "Add option for generating coverage info."
* commit '
330292480272aed3d7663ae7a7668675c742b2e0':
Add option for generating coverage info.
Dan Albert [Wed, 24 Sep 2014 16:03:27 +0000 (16:03 +0000)]
Merge "Add option for generating coverage info."
Dan Albert [Fri, 19 Sep 2014 21:25:57 +0000 (14:25 -0700)]
Add option for generating coverage info.
To enable building with coverage, the environment variable
NATIVE_COVERAGE must be set to true.
Set `LOCAL_NATIVE_COVERAGE := true` to generate coverage information for
a given component.
This is currently not supported for clang (b/
17574078, b/
17583330).
If static library A is included in a binary B (dynamic or static
executable, or shared library), and A is built with coverage
information, B is required to link with libgcov.a. Since the make does
not offer a good way to track this dependency, link libgcov.a even if
LOCAL_NATIVE_COVERAGE is not set (but still guarded by NATIVE_COVERAGE).
This ensures that all of the libgcov dependencies will always be
resolved, and causes no change in the resulting binary if coverage is
not used.
Bug:
10134489
Change-Id: Id5a19f2c215e4be80e6eae27ecc19b582f2f6813
Elliott Hughes [Tue, 23 Sep 2014 21:37:05 +0000 (21:37 +0000)]
am
31f21208: am
cb0755f8: Merge "Remove unused HAVE_OFF64_T."
* commit '
31f2120848d2dcbbe3f2571ce9993d3dabff490f':
Remove unused HAVE_OFF64_T.
Elliott Hughes [Tue, 23 Sep 2014 21:30:09 +0000 (21:30 +0000)]
am
cb0755f8: Merge "Remove unused HAVE_OFF64_T."
* commit '
cb0755f8c92c252331614bee7bceeb897357e0f1':
Remove unused HAVE_OFF64_T.
Elliott Hughes [Tue, 23 Sep 2014 21:23:21 +0000 (21:23 +0000)]
Merge "Remove unused HAVE_OFF64_T."
Elliott Hughes [Tue, 23 Sep 2014 20:36:01 +0000 (13:36 -0700)]
Remove unused HAVE_OFF64_T.
Change-Id: I24acf64efcd0fd84d5dda342d4c4293fa59fae1a
Elliott Hughes [Tue, 23 Sep 2014 16:16:48 +0000 (16:16 +0000)]
am
5d76f9e8: am
88c7544e: Merge "Remove the unused IPC macros."
* commit '
5d76f9e8c87ac48b2ff6cceb13cb438c8e6d7064':
Remove the unused IPC macros.
Elliott Hughes [Tue, 23 Sep 2014 16:11:03 +0000 (16:11 +0000)]
am
88c7544e: Merge "Remove the unused IPC macros."
* commit '
88c7544e711e70273b3ab29251ba2ff359a7ea1a':
Remove the unused IPC macros.
Elliott Hughes [Tue, 23 Sep 2014 16:01:13 +0000 (16:01 +0000)]
Merge "Remove the unused IPC macros."
Elliott Hughes [Tue, 23 Sep 2014 03:43:32 +0000 (20:43 -0700)]
Remove the unused IPC macros.
There are still a couple of references to HAVE_WIN32_IPC to be dealt with
later.
Change-Id: Id131fbf2e96d4c1c7bb98629779045375bd5f85f
Elliott Hughes [Tue, 23 Sep 2014 02:09:15 +0000 (02:09 +0000)]
am
50bd6b99: am
c65d93f6: Merge "build: remove HAVE_OOM_ADJ"
* commit '
50bd6b99796e1ec8d688e5867bfe487d50e21372':
build: remove HAVE_OOM_ADJ
Elliott Hughes [Tue, 23 Sep 2014 01:54:23 +0000 (01:54 +0000)]
am
c65d93f6: Merge "build: remove HAVE_OOM_ADJ"
* commit '
c65d93f6964a313f64fee031d8dcdbe996a7204d':
build: remove HAVE_OOM_ADJ
Elliott Hughes [Tue, 23 Sep 2014 01:49:09 +0000 (01:49 +0000)]
Merge "build: remove HAVE_OOM_ADJ"
Todd Poynor [Thu, 5 Sep 2013 00:46:42 +0000 (17:46 -0700)]
build: remove HAVE_OOM_ADJ
This define is no longer used.
Change-Id: I6615d6e4aa09f71b7c4c435ccb83a07bba91b6dc
Ying Wang [Mon, 22 Sep 2014 17:08:49 +0000 (17:08 +0000)]
am
cccbcfe7: (-s ours) am
c5a99042: Merge "Use "" to preserve argument word breaks"
* commit '
cccbcfe753d19b07eeef02c274d46ef987bedfbf':
Use "$@" to preserve argument word breaks
Ying Wang [Mon, 22 Sep 2014 16:50:14 +0000 (16:50 +0000)]
am
c5a99042: Merge "Use "" to preserve argument word breaks"
* commit '
c5a99042e944787b2cd5f2e93ba4775ffd9e36fc':
Use "$@" to preserve argument word breaks
Ying Wang [Mon, 22 Sep 2014 16:42:34 +0000 (16:42 +0000)]
Merge "Use "$@" to preserve argument word breaks"
Ying Wang [Tue, 1 Jul 2014 17:58:10 +0000 (10:58 -0700)]
Use "$@" to preserve argument word breaks
This fixes mmma broken due to quotes stripped in the argument passing.
(cherry picked from commit
dcc8b3729dd1cb89ed344a3855bac9584ac183ac)
Change-Id: Ic8c4bb8e7cb347c1f80b5bc1648f63e58a010e8d
Ying Wang [Sat, 20 Sep 2014 22:23:41 +0000 (22:23 +0000)]
am
4cb0499a: Allow LOCAL_ASSET_DIR point to nonexistent dir
* commit '
4cb0499a5d6875fc13107f237779fb0422b4f7f2':
Allow LOCAL_ASSET_DIR point to nonexistent dir
Ying Wang [Tue, 29 Jul 2014 17:34:30 +0000 (10:34 -0700)]
Allow LOCAL_ASSET_DIR point to nonexistent dir
LOCAL_ASSET_DIR may point to a dir generated during the build process.
We have done similiar things to LOCAL_RESOURCE_DIR.
(cherry picked from commit
bfcdf060bab129581acff32eb70896f719162bc9)
Bug:
16563899
Change-Id: Iaa72196e1e6350ae0720f8a4e0abc68d8d7ed642
Ying Wang [Sat, 20 Sep 2014 01:06:48 +0000 (01:06 +0000)]
am
a7ee956e: am
b69b7d7f: Merge "Fix recovery image build for 32p"
* commit '
a7ee956e9dc20fa5a01606b473b18b0c3980762f':
Fix recovery image build for 32p
Ying Wang [Sat, 20 Sep 2014 00:49:36 +0000 (00:49 +0000)]
am
b69b7d7f: Merge "Fix recovery image build for 32p"
* commit '
b69b7d7fba2a03faa1405da5bde9b6b559c758b2':
Fix recovery image build for 32p
Ying Wang [Sat, 20 Sep 2014 00:38:07 +0000 (00:38 +0000)]
Merge "Fix recovery image build for 32p"
Bill Yi [Sat, 20 Sep 2014 00:02:19 +0000 (00:02 +0000)]
am
e3386105: Remove PinyinIME from target config
* commit '
e3386105e31971378386ef2fe8480aacfc082ea0':
Remove PinyinIME from target config
Bill Yi [Sat, 20 Sep 2014 00:02:15 +0000 (00:02 +0000)]
am
5855c216: (-s ours) am
70d3c707: (-s ours) Merge "Remove PinyinIME from target config - DO NOT MERGE"
* commit '
5855c2161a6cd93fb62c6d2326d9e2f7517f7fa7':
Remove PinyinIME from target config - DO NOT MERGE
Bill Yi [Fri, 19 Sep 2014 23:46:29 +0000 (23:46 +0000)]
am
70d3c707: (-s ours) Merge "Remove PinyinIME from target config - DO NOT MERGE"
* commit '
70d3c707caa45968508d45c703b0edb13199b5ea':
Remove PinyinIME from target config - DO NOT MERGE
Bill Yi [Fri, 19 Sep 2014 23:36:03 +0000 (23:36 +0000)]
Merge "Remove PinyinIME from target config - DO NOT MERGE"
Bill Yi [Fri, 19 Sep 2014 23:06:19 +0000 (16:06 -0700)]
Remove PinyinIME from target config - DO NOT MERGE
BUG:
17578207
Elliott Hughes [Fri, 19 Sep 2014 23:11:08 +0000 (23:11 +0000)]
am
a4a57339: am
e2f54706: Merge "Remove unused HAVE_EPOLL."
* commit '
a4a57339f3de18ee3fef962fea925962a49b26a3':
Remove unused HAVE_EPOLL.
Bill Yi [Fri, 19 Sep 2014 23:04:17 +0000 (16:04 -0700)]
Remove PinyinIME from target config
BUG:
17578207
Elliott Hughes [Fri, 19 Sep 2014 23:02:38 +0000 (23:02 +0000)]
am
e2f54706: Merge "Remove unused HAVE_EPOLL."
* commit '
e2f547060678ed4199b9f398b95643e08e6b6959':
Remove unused HAVE_EPOLL.
Elliott Hughes [Fri, 19 Sep 2014 22:54:17 +0000 (22:54 +0000)]
Merge "Remove unused HAVE_EPOLL."
Elliott Hughes [Fri, 19 Sep 2014 22:12:56 +0000 (15:12 -0700)]
Remove unused HAVE_EPOLL.
The only people who appear to be using this are actually using their own
one.
Change-Id: I349ed4ce3874c1b2f9bad56c93c8ccee88ae9432
Brian Carlstrom [Fri, 19 Sep 2014 22:01:46 +0000 (22:01 +0000)]
am
8c444b61: am
b97b1e59: Merge "Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug"
* commit '
8c444b61b3d3fab99f9bd617a8d7705c81e8da7a':
Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug
Brian Carlstrom [Fri, 19 Sep 2014 21:49:13 +0000 (21:49 +0000)]
am
b97b1e59: Merge "Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug"
* commit '
b97b1e59409ea4b873dbb8d83ba73f978ba7fcba':
Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug
Brian Carlstrom [Fri, 19 Sep 2014 21:41:01 +0000 (21:41 +0000)]
Merge "Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug"
Brian Carlstrom [Fri, 19 Sep 2014 18:30:27 +0000 (11:30 -0700)]
Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug
Bug:
17572009
Change-Id: I0cfc1aa2dd93a8dac21d23d813801c74ed37079a
Michael Runge [Fri, 19 Sep 2014 04:41:22 +0000 (04:41 +0000)]
am
7914651f: Merge "If oem_fingerprint_props is empty, ignore." into lmp-dev
* commit '
7914651f70a1a23c5f822a035c09054dc4ad3d38':
If oem_fingerprint_props is empty, ignore.
Michael Runge [Fri, 19 Sep 2014 04:22:36 +0000 (04:22 +0000)]
Merge "If oem_fingerprint_props is empty, ignore." into lmp-dev
Dan Albert [Fri, 19 Sep 2014 00:16:16 +0000 (00:16 +0000)]
am
92421720: am
98f7742a: Merge "Move selection of C++ STL into the build system."
* commit '
9242172094691c7203ba7cf0a5e5db611ca9032b':
Move selection of C++ STL into the build system.
Dan Albert [Fri, 19 Sep 2014 00:06:28 +0000 (00:06 +0000)]
am
98f7742a: Merge "Move selection of C++ STL into the build system."
* commit '
98f7742a7f5bdc69913ba5e15bba2e60ae5cf724':
Move selection of C++ STL into the build system.
Dan Albert [Thu, 18 Sep 2014 23:51:52 +0000 (23:51 +0000)]
Merge "Move selection of C++ STL into the build system."
Dan Albert [Fri, 12 Sep 2014 21:46:57 +0000 (14:46 -0700)]
Move selection of C++ STL into the build system.
Preparing for migration from stlport to libc++. STL selection is done
with LOCAL_CXX_STL (valid values are default, none, libc++,
libc++_static, stlport, stlport_static, bionic).
The selection of the STL is as follows:
if LOCAL_CXX_STL == 'default'
ifdef LOCAL_SDK_VERSION
Use whatever STL the other NDK options have selected.
else
Use bionic's libstdc++ for target, GNU libstdc++ for host. This
is compatible with the existing build options.
endif
else
if LOCAL_CXX_STL == 'stlport'
Use stlport.
else if LOCAL_CXX_STL == 'libc++'
Use libc++.
else if LOCAL_CXX_STL == ''
Don't use any STL.
endif
endif
Bug:
15193147
Change-Id: If712ba0ae7908d8147a69e29da5c453a183d6540
Vineeta Srivastava [Thu, 18 Sep 2014 22:19:09 +0000 (22:19 +0000)]
am
2726211a: Set oem_fingerprint_properties only when it is not empty.
* commit '
2726211a7c843ccea3b345c0821290a5ee656d9b':
Set oem_fingerprint_properties only when it is not empty.
Michael Runge [Thu, 18 Sep 2014 22:12:45 +0000 (15:12 -0700)]
If oem_fingerprint_props is empty, ignore.
There may be cases where there is an OEM partition
but it has no effect on the OTA itself. In these
cases, ignore an empty value from the misc_info.txt
Change-Id: I5f467e873030765af12810a07ddd5f302ca8cc0b
Vineeta Srivastava [Thu, 18 Sep 2014 21:34:00 +0000 (14:34 -0700)]
Set oem_fingerprint_properties only when it is not empty.
Add oem_fingerprint_properties to misc_info.txt only when it is not empty.
Shamu does not have OEM specific OTA config and oem_fingerprint_properties
does not need to be set in misc_info.txt.
For sprout, it stays the same.
Bug:
16635599
Change-Id: I7e6c6f5ce1f94f8f1b6da0c2f56bc67ff9fc0f1c
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 [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.
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: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: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.
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.
Bruce Beare [Fri, 12 Sep 2014 16:10:37 +0000 (09:10 -0700)]
Fix recovery image build for 32p
When building for 32p, we need to be explicit that we wish to build the 32bit
version of the binaries that will be placed in the recovery image. The recovery
image doesn't actually care... but if we are not explicit in this, the makefiles
will ask for the 64bit binaries but the Android.mk for the binaries will supply
the 32bit images (causing the build to fail)..
Change-Id: I728912bc8e07726888fe8bed4352cbb373911cb7
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
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: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: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 [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"
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
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
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: Ifd2132b428dbc4907527291712690204a3664ac0
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.