Commit Graph

23097 Commits

Author SHA1 Message Date
Ying Wang 87a21c8b89 resolved conflicts for merge of eec386a4 to master
Change-Id: Ia686e67ed480427a6422d87bef2dcd4e44e27266
2015-04-15 14:39:26 -07:00
Mark Salyzyn 06b91b9bcf fs_config: Add fs_config_generate
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
2015-04-15 14:17:12 -07:00
Mark Salyzyn 073a9ebbbf fs_config: use libcutils and libselinux shared libraries
- 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
2015-04-15 14:17:07 -07:00
Kenny Root eec386a4df am 68dc5196: am 03c6e8c5: Merge "Move package signing after file stripping"
* commit '68dc5196226406db84a41a03fe70e6278ed35fcd':
  Move package signing after file stripping
2015-04-15 20:12:21 +00:00
Kenny Root 68dc519622 am 03c6e8c5: Merge "Move package signing after file stripping"
* commit '03c6e8c58686ffe611952d363de21b54f813ca41':
  Move package signing after file stripping
2015-04-15 20:05:57 +00:00
Kenny Root 03c6e8c586 Merge "Move package signing after file stripping" 2015-04-15 19:58:21 +00:00
Kenny Root dff3755a93 Move package signing after file stripping
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
2015-04-15 12:40:22 -07:00
Ying Wang 599b07a4b2 Merge "Auto-clean host tools when switching between apps_only and platform build." 2015-04-15 17:10:05 +00:00
Mark Salyzyn 4660814b51 am d6d6077c: am 2f1bc255: am 8b75ec1c: Merge "disttools: add liblog, libcutils and libselinux shared libraries"
* commit 'd6d6077c999e4ef335312f2740d5d7ad20572f79':
  disttools: add liblog, libcutils and libselinux shared libraries
2015-04-15 15:28:39 +00:00
Mark Salyzyn d6d6077c99 am 2f1bc255: am 8b75ec1c: Merge "disttools: add liblog, libcutils and libselinux shared libraries"
* commit '2f1bc255fc7f0f5a8f6fd96296a119120bc04726':
  disttools: add liblog, libcutils and libselinux shared libraries
2015-04-15 15:05:55 +00:00
Mark Salyzyn 2f1bc255fc am 8b75ec1c: Merge "disttools: add liblog, libcutils and libselinux shared libraries"
* commit '8b75ec1c7b6efa79f358725d0fd7a3932fd273e5':
  disttools: add liblog, libcutils and libselinux shared libraries
2015-04-15 14:55:48 +00:00
Mark Salyzyn 8b75ec1c7b Merge "disttools: add liblog, libcutils and libselinux shared libraries" 2015-04-15 14:45:05 +00:00
Yohann Roussel 77cbe10fd9 Use Jack launcher
Bug: 20132430
Change-Id: I6e30ad3dffbb32824a4c62e562359b084e6a8784
2015-04-15 12:29:01 +02:00
Dan Albert cbdd2c348f am 1fa6d5b0: am 612581e8: am ad1961a7: Merge "Don\'t use libunwindbacktrace for non-ARM."
* commit '1fa6d5b0a3fc873bce4d16056c115bf30e62a147':
  Don't use libunwindbacktrace for non-ARM.
2015-04-14 23:56:11 +00:00
Dan Albert 1fa6d5b0a3 am 612581e8: am ad1961a7: Merge "Don\'t use libunwindbacktrace for non-ARM."
* commit '612581e8ca8bda8c7f74e84fbb9b7859ca3b9840':
  Don't use libunwindbacktrace for non-ARM.
2015-04-14 23:34:03 +00:00
Dan Albert 612581e8ca am ad1961a7: Merge "Don\'t use libunwindbacktrace for non-ARM."
* commit 'ad1961a74736e02ab16d8688ba7f41a687340bdc':
  Don't use libunwindbacktrace for non-ARM.
2015-04-14 23:23:18 +00:00
Dan Albert ad1961a747 Merge "Don't use libunwindbacktrace for non-ARM." 2015-04-14 23:17:41 +00:00
Dan Albert c2ac7201a7 am 803cf699: am 5e7e6d75: am 2d215e38: Merge "Use libcompiler_rt-extras on the host too."
* commit '803cf699262275a771e3211751e77d2817718656':
  Use libcompiler_rt-extras on the host too.
2015-04-14 23:08:47 +00:00
Vinit Deshpande b568bc4366 am d8e3b5e..bc7fc60 from mirror-m-wireless-internal-release
bc7fc60 "MIZ14"
e44925a merge in m-wireless-internal-release history after reset to 554b16da8c
4dc10e0 "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 554b16da8c
635198e "MIZ09B"
ca927f2 "MIZ09"
39c1433 merge in m-wireless-internal-release history after reset to 554b16da8c
bee9a2a "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 554b16da8c
30884d2 "MIZ07"
731c1e7 merge in m-wireless-internal-release history after reset to 554b16da8c
94ff54d "MIZ06"
8104dda merge in m-wireless-internal-release history after reset to 554b16da8c
249c173 "MIZ02"
8f64207 merge in m-wireless-internal-release history after reset to 554b16da8c
a30a61f "MIZ01"
aff0208 merge in m-wireless-internal-release history after reset to 554b16da8c
c9914fe "MIY90"
f0d21f1 merge in m-wireless-internal-release history after reset to 554b16da8c
a3fea1d "MIY89"
cad9311 merge in m-wireless-internal-release history after reset to 554b16da8c
08cc99f "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
2015-04-14 16:04:45 -07:00
Vinit Deshpande 8730e24a86 am "DO NOT MERGE - Bump version to 5.1.1 automerge: 1c..."
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
2015-04-14 16:04:26 -07:00
Vinit Deshpande 55dcbf0ebe am 5d1e929..fae98a4 from mirror-m-wireless-internal-release
fae98a4 "MIY85"
9a17903 merge in m-wireless-internal-release history after reset to ceb0b3c8cd
7e34c67 "MIY84"
a24eb07 merge in m-wireless-internal-release history after reset to ceb0b3c8cd
954668b "MIY83"
890f946 merge in m-wireless-internal-release history after reset to ceb0b3c8cd
ceb0b3c Add selinux and verity support to custom image generation. automerge: ad54a4d
ad54a4d Add selinux and verity support to custom image generation.
4e915ba "MIY82"

Change-Id: If39b6532233a5170a316b7518d75126e41fffc73
2015-04-14 16:04:16 -07:00
Vinit Deshpande b2179f0448 am "resolved conflicts for merge of 68000907 to lmp-mr..."
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
2015-04-14 16:03:58 -07:00
Vinit Deshpande 39939d8017 am bcfe6fa..7d5716e from mirror-m-wireless-internal-release
7d5716e "MIY78"
28b8df2 merge in m-wireless-internal-release history after reset to ab0b128073
ab0b128 Support to configure and build multiple custom images. automerge: ae61f50
07f6829 Restrict the verification in block-based incremental OTAs automerge: daebaa6
d7bf504 "MIY77"
ce9efce merge in m-wireless-internal-release history after reset to 597cfdb9db
8445b5e "MIY76"
e67dbed merge in m-wireless-internal-release history after reset to 597cfdb9db
562f7bc "MIY75"
8f3374e merge in m-wireless-internal-release history after reset to 597cfdb9db
ae61f50 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
2015-04-14 16:03:52 -07:00
Dan Albert 803cf69926 am 5e7e6d75: am 2d215e38: Merge "Use libcompiler_rt-extras on the host too."
* commit '5e7e6d7585ff94198a5ddd891faba274cf2416d6':
  Use libcompiler_rt-extras on the host too.
2015-04-14 22:48:57 +00:00
Mark Salyzyn c506e74dc8 disttools: add liblog, libcutils and libselinux shared libraries
Bug: 19908228
Change-Id: I48450a9fb917408cb3bc0e41d70c0593acd2b884
2015-04-14 15:17:16 -07:00
Dan Albert 5e7e6d7585 am 2d215e38: Merge "Use libcompiler_rt-extras on the host too."
* commit '2d215e38c02828c1f10ccdb205011025c4172cb6':
  Use libcompiler_rt-extras on the host too.
2015-04-14 22:15:02 +00:00
Dan Albert 2d215e38c0 Merge "Use libcompiler_rt-extras on the host too." 2015-04-14 22:04:56 +00:00
Dan Albert 3e99e66213 Don't use libunwindbacktrace for non-ARM.
After fixing the link order here, it seems libunwindbacktrace no
longer works for exception unwinding, but libgcc now does.

Change-Id: Ice79af4b8f234ed6a053ee818b6dec3aa9706c8a
2015-04-14 14:42:45 -07:00
Ying Wang 036b53b6de 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
2015-04-14 14:14:19 -07:00
Clay Murphy 30f6657d43 Merge "Docs: improve the highlighting of definition lists (<dt> and <dd> elements)" 2015-04-14 18:43:03 +00:00
Joe Fernandez c11559b204 am fd7b099e: am 983f9e49: am b0ff62a1: am a74d2efe: Merge "docs: add new style elements for Material Design cross-references" into lmp-docs
* commit 'fd7b099e2d9c61d4615b99e499e30bbd99ecccca':
  docs: add new style elements for Material Design cross-references
2015-04-14 17:56:12 +00:00
Clay Murphy c63c3e3049 Docs: improve the highlighting of definition lists (<dt> and <dd> elements)
Bug: 18947865
Change-Id: Ibe0966bed1deb2c45d0f323c809d36dc3f33dd17
2015-04-14 10:50:29 -07:00
Joe Fernandez fd7b099e2d am 983f9e49: am b0ff62a1: am a74d2efe: Merge "docs: add new style elements for Material Design cross-references" into lmp-docs
* commit '983f9e494f0c7f73577101adf391143753dfc4ff':
  docs: add new style elements for Material Design cross-references
2015-04-14 17:35:00 +00:00
Joe Fernandez 983f9e494f am b0ff62a1: am a74d2efe: Merge "docs: add new style elements for Material Design cross-references" into lmp-docs
* commit 'b0ff62a18102d5e8aebb6f93d304db78b94e826f':
  docs: add new style elements for Material Design cross-references
2015-04-14 17:25:09 +00:00
Joe Fernandez b0ff62a181 am a74d2efe: Merge "docs: add new style elements for Material Design cross-references" into lmp-docs
* commit 'a74d2efe8fbb131bc41650bce0deb92073dced46':
  docs: add new style elements for Material Design cross-references
2015-04-14 17:13:10 +00:00
Joe Fernandez a74d2efe8f Merge "docs: add new style elements for Material Design cross-references" into lmp-docs 2015-04-14 16:54:49 +00:00
The Android Automerger bc7fc60c5f "MIZ14" 2015-04-14 06:54:57 -07:00
The Android Automerger e44925a420 merge in m-wireless-internal-release history after reset to 554b16da8c 2015-04-14 06:45:50 -07:00
Dirk Dougherty 99f9af659f am 3c5e45ff: am 70b2a811: am 9317e408: am ffc357f0: Merge "Increment metadata files for new families pages." into lmp-docs
* commit '3c5e45ff37e27cea465c24d4c1371bd05e122873':
  Increment metadata files for new families pages.
2015-04-14 05:13:29 +00:00
Joe Fernandez a5863928c2 docs: add new style elements for Material Design cross-references
Change-Id: I718cca684af36294aa89206f3845af5287d05bbe
2015-04-13 21:59:56 -07:00
Dirk Dougherty 3c5e45ff37 am 70b2a811: am 9317e408: am ffc357f0: Merge "Increment metadata files for new families pages." into lmp-docs
* commit '70b2a811ccd6fa74770f5747aa5cd97d3bae4b33':
  Increment metadata files for new families pages.
2015-04-14 04:54:27 +00:00
Dirk Dougherty 70b2a811cc am 9317e408: am ffc357f0: Merge "Increment metadata files for new families pages." into lmp-docs
* commit '9317e40807184cfa4b0e8bc001a12446dc3d9f15':
  Increment metadata files for new families pages.
2015-04-14 04:42:57 +00:00
Dirk Dougherty 9317e40807 am ffc357f0: Merge "Increment metadata files for new families pages." into lmp-docs
* commit 'ffc357f098b9fb939d6869c0f2f1b70fb20c88b6':
  Increment metadata files for new families pages.
2015-04-14 04:33:24 +00:00
Dirk Dougherty ffc357f098 Merge "Increment metadata files for new families pages." into lmp-docs 2015-04-14 04:14:27 +00:00
smain@google.com de678b975e am 0d98fcbd: am d4565d8f: am def19e79: am 7c22c9a4: skeleton structure for NDK site
* commit '0d98fcbd93d661348dcaf17647614254d2265ab2':
  skeleton structure for NDK site
2015-04-14 03:10:01 +00:00
Andrew Hsieh 1849365e7b am 263e22d4: am 051f18f0: am f37e96e2: Merge "Revert "Enable linker -fix-cortex-a53-843419""
* commit '263e22d424a80de023143c4758e1e534c726a07d':
  Revert "Enable linker -fix-cortex-a53-843419"
2015-04-14 03:01:10 +00:00
smain@google.com 0d98fcbd93 am d4565d8f: am def19e79: am 7c22c9a4: skeleton structure for NDK site
* commit 'd4565d8f38bb89a385fa27c42f0129e7330bb5f1':
  skeleton structure for NDK site
2015-04-14 02:43:59 +00:00
Dirk Dougherty 26b600676b Increment metadata files for new families pages.
Change-Id: I9df9bde9bcd04c19c92006cff337619b8c3594e7
2015-04-13 18:30:39 -07:00
Andrew Hsieh 263e22d424 am 051f18f0: am f37e96e2: Merge "Revert "Enable linker -fix-cortex-a53-843419""
* commit '051f18f0dce3d0e6278d5bd9b2aad03974549fb5':
  Revert "Enable linker -fix-cortex-a53-843419"
2015-04-14 00:08:51 +00:00
Andrew Hsieh 051f18f0dc am f37e96e2: Merge "Revert "Enable linker -fix-cortex-a53-843419""
* commit 'f37e96e232f7ac3d618526aafcd69705ac7bb3a4':
  Revert "Enable linker -fix-cortex-a53-843419"
2015-04-13 23:58:47 +00:00