OSDN Git Service
Tao Bao [Wed, 29 Jul 2015 21:34:48 +0000 (21:34 +0000)]
am
4ac8e059: Merge "Read fstab from the source build."
* commit '
4ac8e059bfd26a18fe3bcf2dfa3fdb60dfed824e':
Read fstab from the source build.
Tao Bao [Wed, 29 Jul 2015 21:21:14 +0000 (21:21 +0000)]
Merge "Read fstab from the source build."
Tao Bao [Wed, 29 Jul 2015 21:09:23 +0000 (14:09 -0700)]
Read fstab from the source build.
When creating incremental OTAs, we should always use the fstab from the
source build instead of the target.
Bug:
21948974
Change-Id: Iff44130f88a679b253ea1adcfac4ed8566ce9cc7
Ying Wang [Wed, 29 Jul 2015 17:21:15 +0000 (17:21 +0000)]
am
d864f439: Merge "Remove from DEX2OAT_DEPENDENCY when USE_DEX2OAT_DEBUG is set."
* commit '
d864f43932cb0da10837efb0da270af4cbfc0f91':
Remove $(DEX2OAT) from DEX2OAT_DEPENDENCY when USE_DEX2OAT_DEBUG is set.
Ying Wang [Wed, 29 Jul 2015 16:59:50 +0000 (16:59 +0000)]
Merge "Remove $(DEX2OAT) from DEX2OAT_DEPENDENCY when USE_DEX2OAT_DEBUG is set."
Elliott Hughes [Wed, 29 Jul 2015 16:13:01 +0000 (16:13 +0000)]
am
d3fd73f1: Merge "Remove HAVE_WINDOWS_PATHS."
* commit '
d3fd73f157524fcc369a3c99de580d3598640ed8':
Remove HAVE_WINDOWS_PATHS.
Elliott Hughes [Wed, 29 Jul 2015 15:48:41 +0000 (15:48 +0000)]
Merge "Remove HAVE_WINDOWS_PATHS."
Elliott Hughes [Wed, 29 Jul 2015 15:45:40 +0000 (08:45 -0700)]
Remove HAVE_WINDOWS_PATHS.
Change-Id: I11284ceddf08eb284af56360f0cf80f4725c98e9
Tao Bao [Tue, 28 Jul 2015 23:42:52 +0000 (23:42 +0000)]
am
bcc4d671: Merge "Support systems that use a full copy of recovery image."
* commit '
bcc4d671745beaa5314a0a1133adc0347b55db77':
Support systems that use a full copy of recovery image.
Tao Bao [Tue, 28 Jul 2015 23:28:40 +0000 (23:28 +0000)]
Merge "Support systems that use a full copy of recovery image."
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: Ie271d3e2d55d7b003f667ac5b44203d69b23c63b
(cherry picked from commit
8beab69bd5d728810aca55536017912e65777bb8)
Fredrik Roubert [Mon, 27 Jul 2015 19:48:39 +0000 (21:48 +0200)]
Remove $(DEX2OAT) from DEX2OAT_DEPENDENCY when USE_DEX2OAT_DEBUG is set.
Currently, DEX2OATD_DEPENDENCY is created by appending $(DEX2OATD) to
the value of DEX2OAT_DEPENDENCY and then if USE_DEX2OAT_DEBUG is set,
DEX2OAT_DEPENDENCY is set to DEX2OATD_DEPENDENCY, adding a dependency
on $(DEX2OAT) even in configurations where this will not be built.
This change removes DEX2OATD and DEX2OATD_DEPENDENCY entirely to instead
assign dex2oat or dex2oatd to DEX2OAT depending on USE_DEX2OAT_DEBUG,
making it possible to build with these flags set:
USE_DEX2OAT_DEBUG=true
ART_BUILD_HOST_NDEBUG=false
ART_BUILD_HOST_DEBUG=true
ART_BUILD_TARGET_NDEBUG=false
ART_BUILD_TARGET_DEBUG=true
make build-art-host
Change-Id: I4fa75d1b7e9751c73c43ec943fd8446cc231a070
Elliott Hughes [Tue, 28 Jul 2015 15:07:40 +0000 (15:07 +0000)]
am
7ecb919d: Merge "Remove unused "host/Directories.h"."
* commit '
7ecb919dbaffe20c310367fd96a327d4f57adfd8':
Remove unused "host/Directories.h".
Elliott Hughes [Tue, 28 Jul 2015 14:55:06 +0000 (14:55 +0000)]
Merge "Remove unused "host/Directories.h"."
Elliott Hughes [Tue, 28 Jul 2015 14:49:02 +0000 (07:49 -0700)]
Remove unused "host/Directories.h".
There's no implementation of these functions.
Change-Id: Ic12286ccd1a392be32e5da67e5b7637bac4820f6
Dan Albert [Tue, 28 Jul 2015 00:13:58 +0000 (00:13 +0000)]
am
d4ff2283: Merge "Disallow LOCAL_CXX_STL with LOCAL_SDK_VERSION."
* commit '
d4ff228319d8382a062c9843511d760d1933a9f4':
Disallow LOCAL_CXX_STL with LOCAL_SDK_VERSION.
Dan Albert [Tue, 28 Jul 2015 00:04:36 +0000 (00:04 +0000)]
Merge "Disallow LOCAL_CXX_STL with LOCAL_SDK_VERSION."
Dan Albert [Mon, 27 Jul 2015 21:14:56 +0000 (14:14 -0700)]
Disallow LOCAL_CXX_STL with LOCAL_SDK_VERSION.
Change-Id: I2cd97b453ad24cc4e5d59b4035e861df41b8cbb9
Ying Wang [Mon, 27 Jul 2015 19:01:49 +0000 (19:01 +0000)]
am
b1c0a86f: Merge "Bump generic_arm64 system partition size to 1200 MB."
* commit '
b1c0a86f7a178a517caf2c815b20bda276935df9':
Bump generic_arm64 system partition size to 1200 MB.
Ying Wang [Mon, 27 Jul 2015 18:48:35 +0000 (18:48 +0000)]
Merge "Bump generic_arm64 system partition size to 1200 MB."
Ying Wang [Mon, 27 Jul 2015 18:01:50 +0000 (11:01 -0700)]
Bump generic_arm64 system partition size to 1200 MB.
Change-Id: I31740673829e578d7fc0edd895868bf1f21cfe15
Ying Wang [Fri, 24 Jul 2015 19:54:00 +0000 (19:54 +0000)]
am
cb031414: Merge "Fix mmma uses like "mmma ./external/apache-harmony""
* commit '
cb0314145956c4f918c961e2ecbdfb97a080ac61':
Fix mmma uses like "mmma ./external/apache-harmony"
Ying Wang [Fri, 24 Jul 2015 19:35:47 +0000 (19:35 +0000)]
Merge "Fix mmma uses like "mmma ./external/apache-harmony""
Ying Wang [Fri, 24 Jul 2015 19:30:41 +0000 (12:30 -0700)]
Fix mmma uses like "mmma ./external/apache-harmony"
Fix mmma uses like "mmma ./external/apache-harmony" by removing the
leading ./ in entries in BUILD_MODULES_IN_PATHS.
Change-Id: I414e734c8a29434fc89ddb2b745613c33709c5e3
Colin Cross [Fri, 24 Jul 2015 18:55:36 +0000 (18:55 +0000)]
am
f8f448b3: Merge "Build with kati+ninja when USE_NINJA=true"
* commit '
f8f448b3cac0bebdd8012fec5087af7805885f2d':
Build with kati+ninja when USE_NINJA=true
Colin Cross [Fri, 24 Jul 2015 18:43:58 +0000 (18:43 +0000)]
Merge "Build with kati+ninja when USE_NINJA=true"
Brian Carlstrom [Fri, 24 Jul 2015 04:24:46 +0000 (04:24 +0000)]
am
73a2a902: Merge "Remove unneeded aapt dependency"
* commit '
73a2a9028f6feae81a2734e0dd4bdc4e13f66efd':
Remove unneeded aapt dependency
Brian Carlstrom [Fri, 24 Jul 2015 04:10:25 +0000 (04:10 +0000)]
Merge "Remove unneeded aapt dependency"
Colin Cross [Fri, 17 Jul 2015 00:27:52 +0000 (17:27 -0700)]
Build with kati+ninja when USE_NINJA=true
If USE_NINJA=true, use kati to translate makefiles into ninja files,
and then execute them with ninja.
Builds kati from source using simplified versions of the rules
in binary.mk and definitions.mk.
Adds two new goals when USE_NINJA=true: generateonly will regenerate
build.ninja but not rebuild (useful for comparing build.ninja output
between runs), and fastincremental will skip regenerating build.ninja
and go directly to running ninja, providing ~5 second incremental
builds.
Change-Id: Ib85399e730f1fbb1be7371fafeee7d1c31080771
Brian Carlstrom [Fri, 24 Jul 2015 00:12:10 +0000 (17:12 -0700)]
Remove unneeded aapt dependency
Change-Id: Ie9b550367f7c6b91d46dc2506c420a45b0d39703
Colin Cross [Thu, 23 Jul 2015 22:19:37 +0000 (22:19 +0000)]
am
8291ad58: Merge "Add build subprojects to .gitignore"
* commit '
8291ad587e232b4046158f077194fc981a691a16':
Add build subprojects to .gitignore
Colin Cross [Thu, 23 Jul 2015 22:11:31 +0000 (22:11 +0000)]
Merge "Add build subprojects to .gitignore"
Colin Cross [Thu, 23 Jul 2015 20:18:22 +0000 (13:18 -0700)]
Add build subprojects to .gitignore
Add blueprint, kati, and soong subdirectories to .gitignore so nothing
gets committed there when new subprojects are added to the manifest.
Change-Id: I888b94a89c87d99c8d28e8abd07a830f9cd86702
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 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: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)
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 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."
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."
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
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."""
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: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
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
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
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:06:00 +0000 (20:06 +0000)]
am
a521a37d: Merge "mgrep: add output to environment commands"
* commit '
a521a37da9214ecc6400b7caf00b76869b1dc741':
mgrep: add output to environment commands
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 20:45:55 +0000 (20:45 +0000)]
am
ecb7b37b: Merge "Assert the stash size when generating OTAs."
* commit '
ecb7b37be27e1d7eda5c5aca67c59b88591b9530':
Assert the stash size when generating OTAs.
Tao Bao [Tue, 14 Jul 2015 20:37:49 +0000 (20:37 +0000)]
Merge "Assert the stash size when generating OTAs."
Tao Bao [Thu, 21 May 2015 21:09:49 +0000 (14:09 -0700)]
Assert the stash size when generating OTAs.
With block-based OTA v2 and v3, it requires stash space on the /cache
partition to back up blocks during an update. We need to ensure that
it doesn't exceed the partition size. Since there might be other files
on /cache as well, we use cache_size * threshold as the maximum allowed
size. The threshold defaults to 0.8, which can be overridden by command
line option '--stash_threshold'.
Change-Id: I5c2e353ea4716328d6cdc6a7f758520de8d88b8e
(cherry picked from commit
23ac4042128e47f6fe1ef176e7cb96f907d8e149)
Evgenii Stepanov [Tue, 14 Jul 2015 18:13:20 +0000 (18:13 +0000)]
am
832fa5d7: Merge "Disable detection of bugs on global variables."
* commit '
832fa5d7146a28a52f2c4f5f38f981f1e858ec8a':
Disable detection of bugs on global variables.
Evgenii Stepanov [Sat, 11 Jul 2015 01:06:51 +0000 (18:06 -0700)]
Use a different linker for ASan binaries.
Another change in bionic/linker adds linker_asan/linker_asan64 that
know where to find ASan shared libraries.
Also, include linker_asan to the required packages list when building
for ASan.
Change-Id: I8ebe7c0091bbeb0c135708a891d33d9844373d37
Evgenii Stepanov [Tue, 14 Jul 2015 18:03:03 +0000 (18:03 +0000)]
Merge "Disable detection of bugs on global variables."
Evgenii Stepanov [Tue, 14 Jul 2015 01:12:17 +0000 (18:12 -0700)]
Disable detection of bugs on global variables.
This is a temporary change pending code cleanup.
We are already disabling detection of ODR violations. As it turns out,
an ODR between an ASan-instrumented library and a non-instrumented library
may actually crash ASan, and there is no obvious way out, and one of those
prevents us from booting a SANITIZE_TARGET image right now.
Bug:
21951850
Change-Id: I49508242ec96089a3d4d8b7e45f36323d62f2be9
William Roberts [Mon, 13 Jul 2015 00:06:38 +0000 (17:06 -0700)]
mgrep: add output to environment commands
Change-Id: I7a97e00c7ef5ac179333303d89511c2f72cbd100
Signed-off-by: William Roberts <william.c.roberts@intel.com>
Tao Bao [Sat, 11 Jul 2015 01:11:43 +0000 (01:11 +0000)]
am
2e4dd9ab: Merge "Fix the permission in common.ZipWriteStr()."
* commit '
2e4dd9ab2635f6a22df407ae1ee4dc16e0601102':
Fix the permission in common.ZipWriteStr().
Tao Bao [Sat, 11 Jul 2015 00:58:32 +0000 (00:58 +0000)]
Merge "Fix the permission in common.ZipWriteStr()."
Tao Bao [Sat, 11 Jul 2015 00:18:23 +0000 (17:18 -0700)]
Fix the permission in common.ZipWriteStr().
common.ZipWriteStr() should set a default file permission to 0o100644
instead of 0o644.
Change-Id: I8c89d8442b095b56ad3a0d47afdfa73ce55ad0c8
Tao Bao [Fri, 10 Jul 2015 21:41:12 +0000 (21:41 +0000)]
am
c8812493: Merge "Pack file_contexts into target_files zip."
* commit '
c881249354d9a847b09d314fd1a64bbab122f0fa':
Pack file_contexts into target_files zip.
Tao Bao [Fri, 10 Jul 2015 21:21:53 +0000 (21:21 +0000)]
Merge "Pack file_contexts into target_files zip."
Tao Bao [Thu, 9 Jul 2015 18:51:16 +0000 (11:51 -0700)]
Pack file_contexts into target_files zip.
file_contexts (specified by SELINUX_FC) is needed both when building
and (re)packaging. We used to use the copy in out/ when building, and
looked for the copy in BOOT/RAMDISK/ when packaging from target_files
zip. With system_root_image enabled, the file_contexts needed for
building and packaging might be different from the one on device. So
we explicitly pack the file as META/file_contexts in target_files zip.
Also refactor out the overriding of selinux_fc property into
common.LoadInfoDict().
Change-Id: I94f9ea6671b3792c12c1c21573840743d63da39a
(cherry picked from commit
aa7318c3849095aeb3bea00efbf303c0c40a089d)
Tao Bao [Fri, 10 Jul 2015 21:01:54 +0000 (21:01 +0000)]
am
da724f7a: Merge "Zero out blocks that may be touched by dm-verity."
* commit '
da724f7a630abc122f8eae042264ee81cf1450c4':
Zero out blocks that may be touched by dm-verity.
Tao Bao [Fri, 10 Jul 2015 20:51:34 +0000 (20:51 +0000)]
Merge "Zero out blocks that may be touched by dm-verity."
Tao Bao [Fri, 10 Jul 2015 00:37:49 +0000 (17:37 -0700)]
Zero out blocks that may be touched by dm-verity.
dm-verity may touch some blocks that are not in the care_map due to
block device read-ahead. It will fail if such blocks contain
non-zeroes. As a workaround, we mark them as extended blocks and
zero out explicitly to avoid dm-verity failures.
Bug:
20881595
Change-Id: Id097138bfd065c84eac088b3ad49758010b2927b
(cherry picked from commit
2fd2c9bfd6c9beeaeccb4632b785227fe56c6006)
Elliott Hughes [Thu, 9 Jul 2015 17:50:52 +0000 (17:50 +0000)]
am
76eaa968: Merge "Remove HAVE_WIN32_IPC."
* commit '
76eaa96875d5aac8d5141095e9e345a9ff84d814':
Remove HAVE_WIN32_IPC.
Elliott Hughes [Thu, 9 Jul 2015 17:30:16 +0000 (17:30 +0000)]
Merge "Remove HAVE_WIN32_IPC."
Elliott Hughes [Thu, 9 Jul 2015 17:20:13 +0000 (10:20 -0700)]
Remove HAVE_WIN32_IPC.
Change-Id: I6c01ed5b059c230d7382dc6158103f31d4bf9dbb
Elliott Hughes [Wed, 8 Jul 2015 23:22:45 +0000 (23:22 +0000)]
am
60dda9c4: Merge "Remove mkbootimg from the pathmap."
* commit '
60dda9c44dfef577d8f95784c1554696882d83f7':
Remove mkbootimg from the pathmap.
Elliott Hughes [Wed, 8 Jul 2015 23:22:44 +0000 (23:22 +0000)]
am
fd5692b3: Merge "Stop polluting the namespace with HAVE_MALLOC_H in AndroidConfig.h."
* commit '
fd5692b32c88306cfc800bdffb10a277d9cb080a':
Stop polluting the namespace with HAVE_MALLOC_H in AndroidConfig.h.
Elliott Hughes [Wed, 8 Jul 2015 23:13:31 +0000 (23:13 +0000)]
Merge "Remove mkbootimg from the pathmap."
Elliott Hughes [Wed, 8 Jul 2015 23:11:17 +0000 (23:11 +0000)]
Merge "Stop polluting the namespace with HAVE_MALLOC_H in AndroidConfig.h."
Elliott Hughes [Wed, 8 Jul 2015 23:05:17 +0000 (16:05 -0700)]
Remove mkbootimg from the pathmap.
It's only ever referred to directly. (Should probably move to
system/core/include, but that's orthogonal to this change.)
Change-Id: I353afff031a29206aaa5a0991fe0ccb39e4731e2
Elliott Hughes [Wed, 8 Jul 2015 21:34:53 +0000 (21:34 +0000)]
am
8f548f35: Merge "Remove pathmap.mk entries for libc."
* commit '
8f548f35d6c01c9dea76da885165e40aa10151f9':
Remove pathmap.mk entries for libc.
Elliott Hughes [Wed, 8 Jul 2015 21:19:59 +0000 (21:19 +0000)]
Merge "Remove pathmap.mk entries for libc."
Elliott Hughes [Wed, 8 Jul 2015 20:13:37 +0000 (13:13 -0700)]
Remove pathmap.mk entries for libc.
Change-Id: I9f4ce70696dd7df5922b3c80501fac9c7d4b7149