OSDN Git Service
Tao Bao [Wed, 22 Jul 2015 19:33:18 +0000 (12:33 -0700)]
Support systems that use a full copy of recovery image.
If BOARD_USES_FULL_RECOVERY_IMAGE == true, a full copy of recovery
image will be carried as /system/etc/recovery.img instead of a patch
at /system/recovery_from_boot.p.
Bug:
22641135
Change-Id: I4acaca86c22bca55c2b936a820edf1f333615609
Yohann Roussel [Thu, 2 Jul 2015 10:10:17 +0000 (12:10 +0200)]
Clean call-jack and its callers
This is possible now that we have the new Jack server.
Also fix dependency from dex/jack target to jack script
instead of jack.jar.
(cherry picked from commit
5e50b342218fe2b9c1af20fd7da3c173bfac0499)
Change-Id: I8e7aa5087ba8d73cc93140ddfca8f4ab2f505175
Ying Wang [Wed, 22 Jul 2015 00:26:18 +0000 (00:26 +0000)]
Ying Wang [Wed, 22 Jul 2015 00:26:17 +0000 (00:26 +0000)]
am
4ed70e43: am
c677675c: am
83568a6d: Merge "Create OUT_DIR before writing build_number.txt."
* commit '
4ed70e43a04b254bf0ea8f8d7d3b2d57b0421552':
Create OUT_DIR before writing build_number.txt.
Ying Wang [Wed, 22 Jul 2015 00:12:18 +0000 (00:12 +0000)]
Ying Wang [Wed, 22 Jul 2015 00:12:16 +0000 (00:12 +0000)]
am
c677675c: am
83568a6d: Merge "Create OUT_DIR before writing build_number.txt."
* commit '
c677675cccc8a6894b45469a9b8b4f72efe99b9d':
Create OUT_DIR before writing build_number.txt.
Ying Wang [Tue, 21 Jul 2015 23:57:42 +0000 (23:57 +0000)]
Ying Wang [Tue, 21 Jul 2015 23:57:41 +0000 (23:57 +0000)]
am
83568a6d: Merge "Create OUT_DIR before writing build_number.txt."
* commit '
83568a6d884f695854d5f7ffe79e465db061dcaa':
Create OUT_DIR before writing build_number.txt.
Ying Wang [Tue, 21 Jul 2015 23:45:42 +0000 (23:45 +0000)]
Merge "Cleanups."
Ying Wang [Tue, 21 Jul 2015 23:44:45 +0000 (23:44 +0000)]
Merge "Create OUT_DIR before writing build_number.txt."
Ying Wang [Tue, 21 Jul 2015 23:22:51 +0000 (16:22 -0700)]
Create OUT_DIR before writing build_number.txt.
Change-Id: I6a84ec59194c48f4291480cb0c94db0da488518c
Ying Wang [Tue, 21 Jul 2015 23:01:00 +0000 (16:01 -0700)]
Cleanups.
- Deleted unused functions in definitions.mk.
- lint is never fully functional in the platform source tree.
- Retire LOCAL_DIST_BUNDLED_BINARIES: now the build system/framework
supports JNI embedded in apk.
Change-Id: I6314cb20d1544c704ccbc4c1f9cccb9c54fb5a51
Ying Wang [Tue, 21 Jul 2015 22:00:43 +0000 (22:00 +0000)]
am
4c252b11: am
a0ef4986: am
80ba4a3f: am
c671a7cf: Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
* commit '
4c252b1156d405188075b9cb1154fdaed3072ffd':
Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
Ying Wang [Tue, 21 Jul 2015 21:49:35 +0000 (21:49 +0000)]
am
4169f10c: am
b22469a8: am
65259743: Merge "Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]"
* commit '
4169f10c97e5a8ab500e6033d6278c68bd821df5':
Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
Ying Wang [Tue, 21 Jul 2015 21:45:48 +0000 (21:45 +0000)]
am
a0ef4986: am
80ba4a3f: am
c671a7cf: Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
* commit '
a0ef4986b488227074cb985e85ad07d92e613555':
Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
Colin Cross [Tue, 21 Jul 2015 21:43:24 +0000 (21:43 +0000)]
am
73021682: resolved conflicts for merge of
8c25fd56 to mnc-dr-dev-plus-aosp
* commit '
73021682133ab4586975ccc826769a57403195c7':
Read BUILD_NUMBER from file in rules
Ying Wang [Tue, 21 Jul 2015 21:36:46 +0000 (21:36 +0000)]
am
b22469a8: am
65259743: Merge "Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]"
* commit '
b22469a8c50510e141a74932acc3fa17a9dd356c':
Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
Ying Wang [Tue, 21 Jul 2015 21:22:53 +0000 (21:22 +0000)]
am
65259743: Merge "Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]"
* commit '
65259743e45886a2941771716b92db91de35ea8c':
Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
Ying Wang [Tue, 21 Jul 2015 21:15:04 +0000 (21:15 +0000)]
am
80ba4a3f: am
c671a7cf: Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
* commit '
80ba4a3fb986b9b536c9118aeb59741f7e206110':
Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
Ying Wang [Tue, 21 Jul 2015 21:09:22 +0000 (21:09 +0000)]
Merge "Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]"
Ying Wang [Tue, 21 Jul 2015 01:40:18 +0000 (18:40 -0700)]
Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
- Don't overwrite [TARGET|HOST]_[CC|CXX] with the [CC|CXX]_WRAPPER prefix,
so that we can disable the wrapper per module.
- Disable ccache on a module when FDO is enabled.
Bug:
22612634
Change-Id: Ibc04a4742d589955066c7eceb43a0da9a2b893bc
(cherry-pick from commit
c671a7cf5cae42b61991d9b72e53d9d8a6ace84e)
Ying Wang [Tue, 21 Jul 2015 21:00:55 +0000 (21:00 +0000)]
am
c671a7cf: Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
* commit '
c671a7cf5cae42b61991d9b72e53d9d8a6ace84e':
Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
Colin Cross [Tue, 21 Jul 2015 19:54:17 +0000 (12:54 -0700)]
resolved conflicts for merge of
8c25fd56 to mnc-dr-dev-plus-aosp
Change-Id: Id97d2e9d2749bf5739ede583462ef83adb1ee60c
Colin Cross [Tue, 21 Jul 2015 19:31:47 +0000 (19:31 +0000)]
am
1d0f6eb1: Merge "Read BUILD_NUMBER from file in rules"
* commit '
1d0f6eb115e4fd0093bd3d026264e579689a57c3':
Read BUILD_NUMBER from file in rules
Colin Cross [Tue, 21 Jul 2015 19:20:36 +0000 (19:20 +0000)]
Merge "Read BUILD_NUMBER from file in rules"
Evgenii Stepanov [Tue, 21 Jul 2015 18:39:14 +0000 (18:39 +0000)]
am
28c10817: am
b8376873: am
db38e7b5: Merge "Disable relocation packer in SANITIZE_TARGET mode."
* commit '
28c1081788c1861e552bfd2d93c3f6d83a0f8621':
Disable relocation packer in SANITIZE_TARGET mode.
Tao Bao [Tue, 21 Jul 2015 18:39:12 +0000 (18:39 +0000)]
am
5442819c: am
a04e6b89: am
dd68e68f: Merge "Override properties that point to out/ directory."
* commit '
5442819cb17290159536a01bb788b081e934b383':
Override properties that point to out/ directory.
Colin Cross [Tue, 21 Jul 2015 18:39:11 +0000 (18:39 +0000)]
am
a2cfb78f: resolve conflicts for merge of
89675456 into mnc-dr-dev-plus-aosp
* commit '
a2cfb78f7931102f6f6db152664c10accf92d3c6':
Do not update previous_XXX.mk when there is no change
Evgenii Stepanov [Tue, 21 Jul 2015 18:28:54 +0000 (18:28 +0000)]
am
b8376873: am
db38e7b5: Merge "Disable relocation packer in SANITIZE_TARGET mode."
* commit '
b837687362903dab10afbf76f5d387586a6e264f':
Disable relocation packer in SANITIZE_TARGET mode.
Tao Bao [Tue, 21 Jul 2015 18:28:15 +0000 (18:28 +0000)]
am
a04e6b89: am
dd68e68f: Merge "Override properties that point to out/ directory."
* commit '
a04e6b89ec262f4dd38c9d80ee05ce313bab9347':
Override properties that point to out/ directory.
Colin Cross [Tue, 21 Jul 2015 17:56:26 +0000 (10:56 -0700)]
resolve conflicts for merge of
89675456 into mnc-dr-dev-plus-aosp
Change-Id: Ia99e16eb83902f008960007468dd4d9fba88319a
Evgenii Stepanov [Tue, 21 Jul 2015 17:44:47 +0000 (17:44 +0000)]
am
db38e7b5: Merge "Disable relocation packer in SANITIZE_TARGET mode."
* commit '
db38e7b5d407a438d05fc300b432cc83692643d8':
Disable relocation packer in SANITIZE_TARGET mode.
Evgenii Stepanov [Tue, 21 Jul 2015 17:30:02 +0000 (17:30 +0000)]
Merge "Disable relocation packer in SANITIZE_TARGET mode."
Yohann Roussel [Tue, 21 Jul 2015 17:04:52 +0000 (17:04 +0000)]
Merge "Revert "Clean call-jack and its callers""
Yohann Roussel [Tue, 21 Jul 2015 16:45:51 +0000 (16:45 +0000)]
Revert "Clean call-jack and its callers"
This reverts commit
4c1fc77c2e8453082601ed8209aaaf5e433bb2f4.
Change-Id: I4f5e3ec1e6fea66f315a9411db17de257817dcc9
Yohann Roussel [Tue, 21 Jul 2015 12:53:51 +0000 (12:53 +0000)]
Merge "Clean call-jack and its callers"
Tao Bao [Tue, 21 Jul 2015 05:13:04 +0000 (05:13 +0000)]
am
dd68e68f: Merge "Override properties that point to out/ directory."
* commit '
dd68e68fdd413fe93b78c648e2564c3c3c5e5cc3':
Override properties that point to out/ directory.
Tao Bao [Tue, 21 Jul 2015 05:01:46 +0000 (05:01 +0000)]
Merge "Override properties that point to out/ directory."
Ying Wang [Tue, 21 Jul 2015 01:40:18 +0000 (18:40 -0700)]
Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
- Don't overwrite [TARGET|HOST]_[CC|CXX] with the [CC|CXX]_WRAPPER prefix,
so that we can disable the wrapper per module.
- Disable ccache on a module when FDO is enabled.
Bug:
22612634
Change-Id: Ibc04a4742d589955066c7eceb43a0da9a2b893bc
repo sync [Tue, 21 Jul 2015 03:31:17 +0000 (12:31 +0900)]
resolved conflicts for merge of
b097c416 to stage-aosp-master
Change-Id: I3e0732ee61e5de40c53ade70ee1d9f6a4c3e77d6
Ying Wang [Tue, 21 Jul 2015 02:48:17 +0000 (02:48 +0000)]
am
e176b2be: am
55fc58cb: am
b74823e2: (-s ours) Merge "Auto-clean host tools when switching between apps_only and platform build."
* commit '
e176b2be3098a84bbb7da28a5c66b6deb03253b1':
Auto-clean host tools when switching between apps_only and platform build.
Dan Albert [Tue, 21 Jul 2015 02:48:16 +0000 (02:48 +0000)]
am
cdb0684d: am
68b828e2: am
f4ffafb1: Merge "Revert "Revert "Hide unwinder symbols in each binary."""
* commit '
cdb0684d973380aee79b99462ba32d14a0ef9335':
Revert "Revert "Hide unwinder symbols in each binary.""
Ying Wang [Tue, 21 Jul 2015 02:35:28 +0000 (02:35 +0000)]
am
55fc58cb: am
b74823e2: (-s ours) Merge "Auto-clean host tools when switching between apps_only and platform build."
* commit '
55fc58cb8f0a53151de48635c5f452bc10691e52':
Auto-clean host tools when switching between apps_only and platform build.
Dan Albert [Tue, 21 Jul 2015 02:35:10 +0000 (02:35 +0000)]
am
68b828e2: am
f4ffafb1: Merge "Revert "Revert "Hide unwinder symbols in each binary."""
* commit '
68b828e21699d15eed9166cb37b1cc31bbcee884':
Revert "Revert "Hide unwinder symbols in each binary.""
Shinichiro Hamaji [Tue, 21 Jul 2015 01:32:40 +0000 (01:32 +0000)]
Merge "Do not update previous_XXX.mk when there is no change"
Ying Wang [Tue, 21 Jul 2015 00:45:57 +0000 (00:45 +0000)]
am
b74823e2: (-s ours) Merge "Auto-clean host tools when switching between apps_only and platform build."
* commit '
b74823e2ff5de41f3bee87f2de76abe6ff4e617f':
Auto-clean host tools when switching between apps_only and platform build.
Shinichiro Hamaji [Mon, 20 Jul 2015 22:28:39 +0000 (07:28 +0900)]
Do not update previous_XXX.mk when there is no change
I'm adding a rule which regenerates ninja files to kati:
https://github.com/shinh/kati/commit/
8666cfba20bf4ff0e59053dcfa7bcac9896bcf16
With this regeneration rule, unnecessary re-generation will happen
when these .mk files are updated even if there are no changes in
their contents. With this patch, these .mk files are updated only
when the contents will be actually changed.
Change-Id: I4c796f9454502f6bb25019b3806ca577ea5258c1
Ying Wang [Tue, 21 Jul 2015 00:32:33 +0000 (00:32 +0000)]
Merge "Auto-clean host tools when switching between apps_only and platform build."
Ying Wang [Tue, 14 Apr 2015 21:10:46 +0000 (14:10 -0700)]
Auto-clean host tools when switching between apps_only and platform build.
For apps_only (also PDK build) we use prebuilt host tools in
prebuilts/sdk/tools; For platform build we use tools built from source.
Auto-clean intermediate files of these tools when build type change is
detected.
Bug:
20213206
Change-Id: I9173af322684c017fdb91a3abfbe39ecfe5650e9
(cherry-pick from commit
036b53b6de3cc2a5de46be31eeb4d07ffb0d057f)
Evgenii Stepanov [Mon, 20 Jul 2015 23:32:53 +0000 (16:32 -0700)]
Disable relocation packer in SANITIZE_TARGET mode.
Workaround for
https://code.google.com/p/address-sanitizer/issues/detail?id=387.
Change-Id: I151c3f0eb7e2a4c92a64192a0b43ac17646eab5c
Dan Albert [Mon, 20 Jul 2015 23:23:58 +0000 (23:23 +0000)]
am
f4ffafb1: Merge "Revert "Revert "Hide unwinder symbols in each binary."""
* commit '
f4ffafb1a3a2d103105650fcd9720aa390360a12':
Revert "Revert "Hide unwinder symbols in each binary.""
Dan Albert [Mon, 20 Jul 2015 23:11:56 +0000 (23:11 +0000)]
Merge "Revert "Revert "Hide unwinder symbols in each binary."""
Yohann Roussel [Thu, 2 Jul 2015 10:10:17 +0000 (12:10 +0200)]
Clean call-jack and its callers
This is possible now that we have the new Jack server.
Also fix dependency from dex/jack target to jack script
instead of jack.jar.
(cherry picked from commit
5e50b342218fe2b9c1af20fd7da3c173bfac0499)
Change-Id: I5dce864624e97c27441a5ee7f8c3cd582613390e
Tao Bao [Sun, 19 Jul 2015 09:38:53 +0000 (02:38 -0700)]
Override properties that point to out/ directory.
A few properties are stored as links to the files in the out/
directory, which are no longer available when (re)packing from
target_files zip. Redirect those properties to the actual files in
the unzipped directory when repacking.
Change-Id: I18e930cbea224ab9c6db8d4e721b1c266a671db6
Colin Cross [Fri, 17 Jul 2015 00:15:19 +0000 (17:15 -0700)]
Read BUILD_NUMBER from file in rules
Using $(BUILD_NUMBER) inside a rule causes odd behavior, as the rule
is different every time make is run, but since make doesn't depend
on the command line it only ends up being built with the new value
if some other dependency has changed.
To allow ninja, which does depend on the command line, to provide the
same behavior, store the build number in out/build_number.txt, and
use a shell expansion to cat the file in rules that use it. This will
cause the rule command to stay identical between builds, while still
getting the new build number if the rule is rerun for a dependency.
Also use the same trick for BUILD_FINGERPRINT, and the date in
droiddoc rules.
Change-Id: I6c5e6b6b3ef4c613563d7f5604df0e401575ba5f
Colin Cross [Fri, 17 Jul 2015 23:30:58 +0000 (23:30 +0000)]
am
f37a042e: am
0f0a6b62: am
03e74d66: Merge "Move @echo to first command in rules"
* commit '
f37a042e274b36fc54934a3faf6ecf04c3dd6bfb':
Move @echo to first command in rules
Colin Cross [Fri, 17 Jul 2015 23:22:48 +0000 (23:22 +0000)]
am
0f0a6b62: am
03e74d66: Merge "Move @echo to first command in rules"
* commit '
0f0a6b62bf9e06f980d86fbd6afeaad33fef03e5':
Move @echo to first command in rules
Colin Cross [Fri, 17 Jul 2015 23:12:41 +0000 (23:12 +0000)]
am
03e74d66: Merge "Move @echo to first command in rules"
* commit '
03e74d66c73558b517a56be75acc9a391c676ba8':
Move @echo to first command in rules
Colin Cross [Fri, 17 Jul 2015 23:01:58 +0000 (23:01 +0000)]
Merge "Move @echo to first command in rules"
Colin Cross [Fri, 17 Jul 2015 00:14:27 +0000 (17:14 -0700)]
Move @echo to first command in rules
Move the @echo command that prints the rule description to be the
first command in each rule so that the kati tool can find it to
use as a ninja rule description.
Change-Id: I90f27c35bb719d327a7f2109f8d00d3589082f19
Ying Wang [Thu, 16 Jul 2015 23:20:30 +0000 (23:20 +0000)]
am
31971a38: am
e3927d79: am
e9b4605a: am
7ac6cb80: Add LOCAL_NO_LIBGCC.
* commit '
31971a3847f94240bcf3c977d11407f5c4a943dd':
Add LOCAL_NO_LIBGCC.
Ying Wang [Thu, 16 Jul 2015 23:05:28 +0000 (23:05 +0000)]
am
e3927d79: am
e9b4605a: am
7ac6cb80: Add LOCAL_NO_LIBGCC.
* commit '
e3927d79fa70467798785b546f8899d07e578ec8':
Add LOCAL_NO_LIBGCC.
Ying Wang [Thu, 16 Jul 2015 22:33:50 +0000 (22:33 +0000)]
am
e9b4605a: am
7ac6cb80: Add LOCAL_NO_LIBGCC.
* commit '
e9b4605a9a42ce30857a1389463a81a99b0dd688':
Add LOCAL_NO_LIBGCC.
Ying Wang [Thu, 16 Jul 2015 22:18:19 +0000 (22:18 +0000)]
am
7ac6cb80: Add LOCAL_NO_LIBGCC.
* commit '
7ac6cb804083a67d31a16b910dabfb76b30150a3':
Add LOCAL_NO_LIBGCC.
Ying Wang [Thu, 16 Jul 2015 21:36:10 +0000 (21:36 +0000)]
Merge "Add droiddoc flag LOCAL_DROIDDOC_STUB_OUT_DIR"
Ying Wang [Thu, 16 Jul 2015 21:21:37 +0000 (14:21 -0700)]
Add droiddoc flag LOCAL_DROIDDOC_STUB_OUT_DIR
When calling droiddoc to generate stubs, if you use
LOCAL_DROIDDOC_STUB_OUT_DIR (instead of "-stubs" to
LOCAL_DROIDDOC_LOCAL_DROIDDOC_OPTIONS), the build system gets the chance
to clean up the stub out directory before calling doclava.
Bug:
22534021
Change-Id: Icb0a73eb51bfb1c1ecd88217ebcd39c27df1de29
Ying Wang [Thu, 2 Jul 2015 18:05:27 +0000 (11:05 -0700)]
Add LOCAL_NO_LIBGCC.
This can be used to compile independent libraries without the need for
libgcc.a.
Change-Id: I924200995569d9a978ddbaa6ec321d80734f1374
(cherry picked from commit
75011b2003733edc483a45d61f5cb1a23f64bfbf)
Ying Wang [Thu, 16 Jul 2015 19:49:25 +0000 (19:49 +0000)]
am
a5c47569: am
f943e811: am
e421b10f: am
e8ecab8d: Merge "Don\'t uncompress/page-align the jni libraries in apps_only build." into mnc-dev
* commit '
a5c47569718370fbc00689098df91286a9dac805':
Don't uncompress/page-align the jni libraries in apps_only build.
Ying Wang [Thu, 16 Jul 2015 19:35:50 +0000 (19:35 +0000)]
am
f943e811: am
e421b10f: am
e8ecab8d: Merge "Don\'t uncompress/page-align the jni libraries in apps_only build." into mnc-dev
* commit '
f943e811febec5a50493a1c7449f8cd2cbda9432':
Don't uncompress/page-align the jni libraries in apps_only build.
Nick Kralevich [Thu, 16 Jul 2015 19:35:23 +0000 (19:35 +0000)]
am
17ca1f5d: am
4a5f5a7b: am
a972891f: Merge "file_contexts: Label /dev/ttyS2 as console_device"
* commit '
17ca1f5d26aebd25fa89e86082d2fe423174aeae':
file_contexts: Label /dev/ttyS2 as console_device
Nick Kralevich [Thu, 16 Jul 2015 19:19:56 +0000 (19:19 +0000)]
am
4a5f5a7b: am
a972891f: Merge "file_contexts: Label /dev/ttyS2 as console_device"
* commit '
4a5f5a7b15e27ed159e2398c77de1de7f9fd4da9':
file_contexts: Label /dev/ttyS2 as console_device
Ying Wang [Thu, 16 Jul 2015 19:10:08 +0000 (19:10 +0000)]
am
e421b10f: am
e8ecab8d: Merge "Don\'t uncompress/page-align the jni libraries in apps_only build." into mnc-dev
* commit '
e421b10f1c50aa11bd4ca299537c16bac0263da8':
Don't uncompress/page-align the jni libraries in apps_only build.
Nick Kralevich [Thu, 16 Jul 2015 19:03:13 +0000 (19:03 +0000)]
am
a972891f: Merge "file_contexts: Label /dev/ttyS2 as console_device"
* commit '
a972891f442d255925df0beadfcfddb81af61575':
file_contexts: Label /dev/ttyS2 as console_device
Ying Wang [Thu, 16 Jul 2015 19:01:55 +0000 (19:01 +0000)]
am
e8ecab8d: Merge "Don\'t uncompress/page-align the jni libraries in apps_only build." into mnc-dev
* commit '
e8ecab8d099f465d527f7bc0fbd04f26ac477a93':
Don't uncompress/page-align the jni libraries in apps_only build.
Ying Wang [Thu, 16 Jul 2015 18:51:19 +0000 (18:51 +0000)]
Merge "Don't uncompress/page-align the jni libraries in apps_only build." into mnc-dev
Nick Kralevich [Thu, 16 Jul 2015 18:47:56 +0000 (18:47 +0000)]
Merge "file_contexts: Label /dev/ttyS2 as console_device"
Miodrag Dinic [Thu, 16 Jul 2015 14:27:17 +0000 (16:27 +0200)]
file_contexts: Label /dev/ttyS2 as console_device
This fixes the issue with the emulator "-shell" option.
Init tries to open the console which is passed through
the kernel androidboot.console property, but fails to
open it because "avc" denies it. Init only has permissions
to open console_device in rw mode. This ensures that
/dev/ttyS2 is properly labeled as console_device.
Replaced tabs with spaces.
Change-Id: I9ef94576799bb724fc22f6be54f12de10ed56768
George Mount [Thu, 16 Jul 2015 17:17:40 +0000 (17:17 +0000)]
am
464827d1: am
daf97ac2: am
54152d30: am
087243dd: Merge "Add data binding to built javadoc." into mnc-dev
* commit '
464827d1e8f5b51df3e6b579f9d83e11c836effb':
Add data binding to built javadoc.
George Mount [Thu, 16 Jul 2015 15:09:40 +0000 (15:09 +0000)]
am
daf97ac2: am
54152d30: am
087243dd: Merge "Add data binding to built javadoc." into mnc-dev
* commit '
daf97ac2b63ed68b34f0dfd52d9f88ff1c7bd79d':
Add data binding to built javadoc.
George Mount [Thu, 16 Jul 2015 14:42:21 +0000 (14:42 +0000)]
am
54152d30: am
087243dd: Merge "Add data binding to built javadoc." into mnc-dev
* commit '
54152d3062b436a0bb060544f1311d124c81bdbe':
Add data binding to built javadoc.
George Mount [Thu, 16 Jul 2015 14:29:34 +0000 (14:29 +0000)]
am
087243dd: Merge "Add data binding to built javadoc." into mnc-dev
* commit '
087243ddcb61b602f4d4eb03022844021a659fda':
Add data binding to built javadoc.
George Mount [Thu, 16 Jul 2015 14:18:41 +0000 (14:18 +0000)]
Merge "Add data binding to built javadoc." into mnc-dev
Ying Wang [Thu, 16 Jul 2015 01:33:24 +0000 (18:33 -0700)]
Don't uncompress/page-align the jni libraries in apps_only build.
Don't uncompress/page-align the jni libraries in apps_only build,
because the apk may be run on older platforms that don't support loading
jni directly from apk.
When prebuilt apks are installed to platform build, the build system
will automatically uncompress/page-align the prebuit apks in M and
downstream, so no need to uncompress/page-align in the apps_only build
either.
Bug:
22491084
Change-Id: I67e977b2592800ae467450592069843b4e5fc466
Tao Bao [Thu, 16 Jul 2015 00:31:57 +0000 (00:31 +0000)]
am
6b021161: am
5a2ed731: am
f737a120: Merge "Enable verbose output for add_img_to_target_files."
* commit '
6b0211616afe4eba923e98cd78c138acd0d53d84':
Enable verbose output for add_img_to_target_files.
Tao Bao [Thu, 16 Jul 2015 00:13:17 +0000 (00:13 +0000)]
am
5a2ed731: am
f737a120: Merge "Enable verbose output for add_img_to_target_files."
* commit '
5a2ed7314f0d6a5dd899694ecfc880cc6a414ff7':
Enable verbose output for add_img_to_target_files.
Tao Bao [Thu, 16 Jul 2015 00:02:32 +0000 (00:02 +0000)]
am
f737a120: Merge "Enable verbose output for add_img_to_target_files."
* commit '
f737a1209841aee5ac76e39677d8ddba0115cae2':
Enable verbose output for add_img_to_target_files.
Tao Bao [Wed, 15 Jul 2015 23:54:27 +0000 (23:54 +0000)]
Merge "Enable verbose output for add_img_to_target_files."
Nick Kralevich [Wed, 15 Jul 2015 20:26:41 +0000 (20:26 +0000)]
am
db44b568: am
abbf8eeb: am
a521a37d: Merge "mgrep: add output to environment commands"
* commit '
db44b56859c8c0a8c417cffda9891881849c73d0':
mgrep: add output to environment commands
Nick Kralevich [Wed, 15 Jul 2015 20:17:51 +0000 (20:17 +0000)]
am
abbf8eeb: am
a521a37d: Merge "mgrep: add output to environment commands"
* commit '
abbf8eeb674b1a9d9b8ac1cc8744f03144c3968c':
mgrep: add output to environment commands
Evgenii Stepanov [Wed, 15 Jul 2015 20:12:00 +0000 (20:12 +0000)]
am
545a6bb2: am
275e3c8c: am
2d0ec893: Merge "Use a different linker for ASan binaries."
* commit '
545a6bb2a636fe0981364749e5f00be41789a434':
Use a different linker for ASan binaries.
Nick Kralevich [Wed, 15 Jul 2015 20:06:00 +0000 (20:06 +0000)]
am
a521a37d: Merge "mgrep: add output to environment commands"
* commit '
a521a37da9214ecc6400b7caf00b76869b1dc741':
mgrep: add output to environment commands
Evgenii Stepanov [Wed, 15 Jul 2015 19:59:13 +0000 (19:59 +0000)]
am
275e3c8c: am
2d0ec893: Merge "Use a different linker for ASan binaries."
* commit '
275e3c8c105e5702b25868f80983c82c668e5664':
Use a different linker for ASan binaries.
Nick Kralevich [Wed, 15 Jul 2015 19:54:03 +0000 (19:54 +0000)]
Merge "mgrep: add output to environment commands"
Evgenii Stepanov [Wed, 15 Jul 2015 19:43:45 +0000 (19:43 +0000)]
am
2d0ec893: Merge "Use a different linker for ASan binaries."
* commit '
2d0ec89357e29138abc28f65876e4aaa208f961c':
Use a different linker for ASan binaries.
Evgenii Stepanov [Wed, 15 Jul 2015 19:34:06 +0000 (19:34 +0000)]
Merge "Use a different linker for ASan binaries."
Tao Bao [Wed, 15 Jul 2015 18:53:39 +0000 (11:53 -0700)]
Enable verbose output for add_img_to_target_files.
Change-Id: I7246c59c79ccf6a7589c884391d0f690746fc129
Tao Bao [Tue, 14 Jul 2015 21:04:20 +0000 (21:04 +0000)]
am
6cc282c1: am
0d4a9405: am
ecb7b37b: Merge "Assert the stash size when generating OTAs."
* commit '
6cc282c10ac60beb1c06b1fdd2f9db1e2b9ba9f5':
Assert the stash size when generating OTAs.
Evgenii Stepanov [Tue, 14 Jul 2015 21:04:18 +0000 (21:04 +0000)]
am
db511b80: am
e7171190: am
832fa5d7: Merge "Disable detection of bugs on global variables."
* commit '
db511b80760a6adb1758f3e34c05f01ab860cd70':
Disable detection of bugs on global variables.
Tao Bao [Tue, 14 Jul 2015 20:53:40 +0000 (20:53 +0000)]
am
0d4a9405: am
ecb7b37b: Merge "Assert the stash size when generating OTAs."
* commit '
0d4a9405938210618bb305e33285f555daf2fb5d':
Assert the stash size when generating OTAs.
Evgenii Stepanov [Tue, 14 Jul 2015 20:46:19 +0000 (20:46 +0000)]
am
e7171190: am
832fa5d7: Merge "Disable detection of bugs on global variables."
* commit '
e71711901f5395de5af64724a9d254173b298108':
Disable detection of bugs on global variables.