* changes:
am d8e3b5e..bc7fc60 from mirror-m-wireless-internal-release
am "DO NOT MERGE - Bump version to 5.1.1 automerge: 1c..."
am 5d1e929..fae98a4 from mirror-m-wireless-internal-release
am "resolved conflicts for merge of 68000907 to lmp-mr..."
am bcfe6fa..7d5716e from mirror-m-wireless-internal-release
fs_config_generate_$(TARGET_DEVICE) is built based off the content
of $(TARGET_ANDROID_FILESYSTEM_CONFIG_H). We also add the rules
fs_config_dirs and fs_config_file to utilize this command
for target contents:
fs_config_generate_$(TARGET_DEVICE) -D -o system/etc/fs_config_dir
fs_config_generate_$(TARGET_DEVICE) -F -o system/etc/fs_config_file
In order to use this feature, one must have the fs_config_dirs and
fs_config_files in the $(PRODUCT_PACKAGES) list defined in the
device make files in $(TARGET_DEVICE_DIR). And either an
android_filesystem_config.h file in that directory, or define a
path in TARGET_ANDROID_FILESYSTEM_CONFIG_H to point to one.
Bug: 19908228
Change-Id: Iee1543d99169f874e0915ae07962a7750ecb6342
- move to libcutils.so and libselinux.so as shared now that
they are in DISTTOOL.
- liblog dependency is part of libcutils, and need not be
called out explicitly now. liblog is in DISTTOOL.
- libcutils fs_config has the right to add Android logging
Bug: 19908228
Change-Id: Iaa60ad624b42d83653840ac3c77bfa03ad8674aa
For dex preopt and JNI library extraction, we should remove the
classes.dex and .so files before we sign the APK so that there
isn't an entry in the manifest.
Prebuilt APKs which are pre-signed will simply not have the files
removed. This may cause some system.img bloat, but signature checks make
this necessary.
Bug: 20247329
Change-Id: I4742d1aa3aa64ab5aea2264304cb8c0bea24f784
bc7fc60 "MIZ14"
e44925a merge in m-wireless-internal-release history after reset to 554b16da8c4dc10e0 "MIZ13C"
705f848 merge in m-wireless-internal-release history after reset to m-wireless-internal-dev
0742b33 "MIZ13B"
d1d0591 merge in m-wireless-internal-release history after reset to m-wireless-internal-dev
7261670 "MIZ13"
e129d44 merge in m-wireless-internal-release history after reset to 554b16da8c635198e "MIZ09B"
ca927f2 "MIZ09"
39c1433 merge in m-wireless-internal-release history after reset to 554b16da8cbee9a2a "MIZ08B"
c660ce4 merge in m-wireless-internal-release history after reset to m-wireless-internal-dev
8827702 "MIZ08"
ccc3aeb merge in m-wireless-internal-release history after reset to 554b16da8c30884d2 "MIZ07"
731c1e7 merge in m-wireless-internal-release history after reset to 554b16da8c94ff54d "MIZ06"
8104dda merge in m-wireless-internal-release history after reset to 554b16da8c249c173 "MIZ02"
8f64207 merge in m-wireless-internal-release history after reset to 554b16da8ca30a61f "MIZ01"
aff0208 merge in m-wireless-internal-release history after reset to 554b16da8cc9914fe "MIY90"
f0d21f1 merge in m-wireless-internal-release history after reset to 554b16da8ca3fea1d "MIY89"
cad9311 merge in m-wireless-internal-release history after reset to 554b16da8c08cc99f "MIY85E"
49b3b63 "MIY85D"
6e44a4b "MIY85C"
554b16d DO NOT MERGE - Bump version to 5.1.1 automerge: 1c3bf5c -s ours
1c3bf5c DO NOT MERGE - Bump version to 5.1.1
Change-Id: I394d2847345dcd4d7adc2f939c10ab6d824d4031
merged from mirror-m-wireless-internal-release with -s ours
No changes were actually committed
554b16d DO NOT MERGE - Bump version to 5.1.1 automerge: 1c3bf5c -s ours
fae98a4 "MIY85"
9a17903 merge in m-wireless-internal-release history after reset to ceb0b3c8cd7e34c67 "MIY84"
a24eb07 merge in m-wireless-internal-release history after reset to ceb0b3c8cd954668b "MIY83"
890f946 merge in m-wireless-internal-release history after reset to ceb0b3c8cdceb0b3c Add selinux and verity support to custom image generation. automerge: ad54a4dad54a4d Add selinux and verity support to custom image generation.
4e915ba "MIY82"
Change-Id: If39b6532233a5170a316b7518d75126e41fffc73
merged from mirror-m-wireless-internal-release with -s ours
No changes were actually committed
d461d4f resolved conflicts for merge of 68000907 to lmp-mr1-dev automerge: 030b549
7d5716e "MIY78"
28b8df2 merge in m-wireless-internal-release history after reset to ab0b128073ab0b128 Support to configure and build multiple custom images. automerge: ae61f5007f6829 Restrict the verification in block-based incremental OTAs automerge: daebaa6d7bf504 "MIY77"
ce9efce merge in m-wireless-internal-release history after reset to 597cfdb9db8445b5e "MIY76"
e67dbed merge in m-wireless-internal-release history after reset to 597cfdb9db562f7bc "MIY75"
8f3374e merge in m-wireless-internal-release history after reset to 597cfdb9dbae61f50 Support to configure and build multiple custom images.
879a3e3 "MIY72"
d582e0b merge in m-wireless-internal-release history after reset to m-wireless-internal-dev
daebaa6 Restrict the verification in block-based incremental OTAs
Change-Id: I66be29bee7cf782dabdd8a616b96103445d0afe8
Jonathan Basseri