Commit Graph

49235 Commits

Author SHA1 Message Date
Adrian Roos 3c1e101f6d Merge "Remove dependencies on hiddenapi files with UNSAFE_DISABLE_HIDDENAPI_FLAGS=true" am: 61ae763ec4
am: 840b7b3df2

Change-Id: Ie045e1214f5c7854d9ff71746878bdc4502c3b47
2019-01-31 11:50:38 -08:00
Adrian Roos 840b7b3df2 Merge "Remove dependencies on hiddenapi files with UNSAFE_DISABLE_HIDDENAPI_FLAGS=true"
am: 61ae763ec4

Change-Id: I18cb7ba88aba2c40a0ed1b135fa1875ae3596fb8
2019-01-31 11:38:38 -08:00
Treehugger Robot 61ae763ec4 Merge "Remove dependencies on hiddenapi files with UNSAFE_DISABLE_HIDDENAPI_FLAGS=true" 2019-01-31 19:25:59 +00:00
Yifan Hong fe4f46caca Merge "Add kernel info to compatibility.zip" am: 5cc9230914
am: b35937ca55

Change-Id: I396a27bddf635afba797816688bb31a6558d6881
2019-01-31 11:25:04 -08:00
Colin Cross 0410f34bff Merge "Fix linker_asan[64] apex bootstrap build error" am: ca8ec381a0
am: d880f0ba95

Change-Id: I0fd96ca927aa65363f0492294793f5a2a072a68a
2019-01-31 11:21:00 -08:00
Yifan Hong b35937ca55 Merge "Add kernel info to compatibility.zip"
am: 5cc9230914

Change-Id: I0884bc155efe99f691af10eb2252cd223e0d9258
2019-01-31 11:18:01 -08:00
Colin Cross d880f0ba95 Merge "Fix linker_asan[64] apex bootstrap build error"
am: ca8ec381a0

Change-Id: Ic679601af9116b6997add7cb9c3fa599d10778d9
2019-01-31 11:17:01 -08:00
Yifan Hong 5cc9230914 Merge "Add kernel info to compatibility.zip" 2019-01-31 19:06:19 +00:00
Colin Cross ca8ec381a0 Merge "Fix linker_asan[64] apex bootstrap build error" 2019-01-31 19:05:59 +00:00
Dan Willemsen a724cbd91a Merge "Deprecate LOCAL_MODULE_TAGS := eng/debug" am: a734907705
am: a3f5b09c42

Change-Id: I6a02ea8aaf44a435973361905d30e691e42c039b
2019-01-31 10:55:46 -08:00
Dan Willemsen a3f5b09c42 Merge "Deprecate LOCAL_MODULE_TAGS := eng/debug"
am: a734907705

Change-Id: I9b5469b27aa18e95010c52f41116ccf24045dd23
2019-01-31 10:40:32 -08:00
Dan Willemsen a734907705 Merge "Deprecate LOCAL_MODULE_TAGS := eng/debug" 2019-01-31 18:32:16 +00:00
Calin Juravle 77a08b4fb2 Merge "Count hotness in system server compiled code" am: 4f3f03c09b
am: 536c2d3de8

Change-Id: Ia7bc1f27df44647b725c13620ca7fa4472593b35
2019-01-31 09:32:17 -08:00
Calin Juravle 536c2d3de8 Merge "Count hotness in system server compiled code"
am: 4f3f03c09b

Change-Id: I7898cae0de71abe8eee28dda40248a4a375572fb
2019-01-31 09:28:09 -08:00
Treehugger Robot 4f3f03c09b Merge "Count hotness in system server compiled code" 2019-01-31 17:19:38 +00:00
Logan Chien c6d2cf86d1 Fix linker_asan[64] apex bootstrap build error
This commit fixes `linker_asan[64]` apex bootstrap build errors.
Without this change, `make -j SANITIZE_TARGET=address` results in:

  FAILED: ninja: 'out/target/product/walleye/system/bin/linker_asan64',
  needed by 'out/target/product/walleye/system/bin/app_process64',
  missing and no known rule to make it

Test: lunch aosp_walleye-userdebug && make SANITIZE_TARGET=address
Change-Id: I980a36499cd327db307321fc8e4548925e7d56bf
2019-01-31 17:07:50 +08:00
Calin Juravle fae75af005 Count hotness in system server compiled code
Bug: 123665033
Test: manual: build & look at system server profile
Change-Id: Ia155073ee6f94424f2c22035283f688a495fba8c
2019-01-31 00:00:34 -08:00
Rett Berg bdd4b9d78a Merge "add pathmod to envsetup.sh for making finding paths to modules easier" am: 9d1aab10f3
am: 83b5653b6a

Change-Id: I7877d74dca04e84c2c4a8214b1c70e6315e2ce80
2019-01-30 17:33:44 -08:00
Rett Berg 83b5653b6a Merge "add pathmod to envsetup.sh for making finding paths to modules easier"
am: 9d1aab10f3

Change-Id: Ie8c1c36d965af9d09491d5043d3aaa5d7da65e23
2019-01-30 17:25:33 -08:00
Rett Berg 9d1aab10f3 Merge "add pathmod to envsetup.sh for making finding paths to modules easier" 2019-01-31 00:39:29 +00:00
Bowgo Tsai 3ea7740946 Merge "DAP: building system_other.img for retrofit devices" am: aa615a1b2d
am: 2b51826211

Change-Id: I9217850fa149493ddaf535b77ac7dc87b12b318e
2019-01-30 15:02:58 -08:00
Bowgo Tsai 2b51826211 Merge "DAP: building system_other.img for retrofit devices"
am: aa615a1b2d

Change-Id: I17f628ddbf0c8ee0262c27c26ad4eb0640f8562a
2019-01-30 14:56:46 -08:00
Treehugger Robot aa615a1b2d Merge "DAP: building system_other.img for retrofit devices" 2019-01-30 22:52:35 +00:00
Mathieu Chartier 97adeb16aa Merge "Enable resolution of startup const-string for non user builds" am: 8fdf4e0f5b
am: 47200d864f

Change-Id: Id7a591e576983461d0a70da731d565a4dcd5d23a
2019-01-30 14:50:36 -08:00
Anton Hansson cc41430a8b Merge "Fix RRO when LOCAL_EXPORT_PACKAGE_RESOURCES is unset" am: bb83cc2689
am: 65adcb9e7f

Change-Id: Iffcf21cec34011e5ae971198157d57a6e78c95e4
2019-01-30 14:49:46 -08:00
Anton Hansson 495c981604 Merge "Exempt some RROs from building against SDK" am: 9a50c1f438
am: 5a4cda4f2b

Change-Id: I64047baee18d32c343ae9e48ffb8e3c262078af2
2019-01-30 14:48:52 -08:00
Mathieu Chartier 47200d864f Merge "Enable resolution of startup const-string for non user builds"
am: 8fdf4e0f5b

Change-Id: Ia82d22d35bbc051fbcddd87bcab88c682c02cbf9
2019-01-30 14:44:42 -08:00
Mathieu Chartier 8fdf4e0f5b Merge "Enable resolution of startup const-string for non user builds" 2019-01-30 22:40:03 +00:00
Anton Hansson 65adcb9e7f Merge "Fix RRO when LOCAL_EXPORT_PACKAGE_RESOURCES is unset"
am: bb83cc2689

Change-Id: I426205719696e3d52788e60a5d7e215ebeadf2f6
2019-01-30 14:39:33 -08:00
Anton Hansson 5a4cda4f2b Merge "Exempt some RROs from building against SDK"
am: 9a50c1f438

Change-Id: I9dbf4e4a98b54aa4d0e47902571d16b6d85fe93f
2019-01-30 14:38:39 -08:00
Anton Hansson bb83cc2689 Merge "Fix RRO when LOCAL_EXPORT_PACKAGE_RESOURCES is unset" 2019-01-30 22:19:25 +00:00
Anton Hansson 9a50c1f438 Merge "Exempt some RROs from building against SDK" 2019-01-30 22:17:25 +00:00
Yifan Hong 770ab053b0 Add kernel info to compatibility.zip
Add kernel configs / version to verified_assembled_vendor_manifest.xml
so that the kernel of the incoming package can be checked against
the framework. Previously, the running kernel was used instead.

Bug: 111125947
Test: test_extract_kernel
Test: manual OTA on Pixel 3 from build:
      Android P (kernel version 4.9.96)
      to ToT build:
      device kernel version = (manually modified) framework requirement = latest,
      PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS = true

Change-Id: Id524a58e94bdb6bba348ca461c9d33614ce451a9
2019-01-30 13:28:03 -08:00
Rett Berg 78d1c93e12 add pathmod to envsetup.sh for making finding paths to modules easier
Change-Id: Ice1f2ff6d46a61bca5a4ddc1163af36c89947822
Test: gomod vsoc_lib && pwd
Test: pathmod vsoc_lib
Test: pathmod foobar  # get error message
Test: gomod foobar    # get error message, directory doesn't change
2019-01-30 12:47:13 -08:00
Sandeep Patil 1569df0004 Merge "vndk: current: remove libpagemap" am: 7839861087
am: 6ee9c26851

Change-Id: Ifcad6f3c7c95d847c7a067a049079a3f75483f2b
2019-01-30 11:37:45 -08:00
Sandeep Patil 6ee9c26851 Merge "vndk: current: remove libpagemap"
am: 7839861087

Change-Id: Ia8627565e4f7470e40505bf458f3b590109efe65
2019-01-30 11:32:35 -08:00
Treehugger Robot 7839861087 Merge "vndk: current: remove libpagemap" 2019-01-30 19:19:26 +00:00
Colin Cross 55b00509e9 Merge changes I0bee792d,I2b7c3c8f am: badde7ced7
am: 8b6c0d1df0

Change-Id: I58c5aedbc7aae27f24e1f87f4df75fee8eaebb5b
2019-01-30 10:47:01 -08:00
Colin Cross 8b6c0d1df0 Merge changes I0bee792d,I2b7c3c8f
am: badde7ced7

Change-Id: I4adfd45722fbd07f7527e2faf4b58694daa3b8cf
2019-01-30 10:43:10 -08:00
Treehugger Robot badde7ced7 Merge changes I0bee792d,I2b7c3c8f
* changes:
  Build aar files for m <module name>
  Add LOCAL_ADDITIONAL_CHECKED_MODULE
2019-01-30 18:26:24 +00:00
Jiyong Park f7b1c4d58e Merge "Reland "Add $(PRODUCT_OUT)/apex to the artifact path whitelist"" am: ea976a2780
am: a3cf81641f

Change-Id: I4054b1d8332da889e55ff1766dbde2e31ca436cd
2019-01-30 09:25:39 -08:00
Mathieu Chartier cf5a8b16ed Enable resolution of startup const-string for non user builds
Bug: 116059983
Bug: 111397239
Test: make
Change-Id: I82dec2041e7cb83897bd7ed7125631c39a4af85a
2019-01-30 17:14:00 +00:00
Jiyong Park a3cf81641f Merge "Reland "Add $(PRODUCT_OUT)/apex to the artifact path whitelist""
am: ea976a2780

Change-Id: I8d5d34cace0f9701b5be22356d084df3a522220b
2019-01-30 09:08:16 -08:00
Treehugger Robot ea976a2780 Merge "Reland "Add $(PRODUCT_OUT)/apex to the artifact path whitelist"" 2019-01-30 16:57:11 +00:00
Colin Cross 89d3d2ae3b Fix RRO when LOCAL_EXPORT_PACKAGE_RESOURCES is unset
If LOCAL_EXPORT_PACKAGE_RESOURCES is unset then
append_enforce_rro_sources was inserting a blank entry into
the 4th.  When converting the || separator back to space that
resulted in a two sequential spaces, which is treated as a
single word separator, causing the 5th field to be treated
as the 4th field.

Put "false" into the 4th field in soong_app_prebuilt.mk to match
package_internal.mk.

Bug: 123510624
Test: m SystemUIGoogle
Change-Id: I794c413e33df2020d0dc43379cfb017e7e09baa1
2019-01-30 16:09:41 +00:00
SzuWei Lin 782e918327 Merge "Add gsi_common.mk" am: 59fa4ca993
am: a4dabb3050

Change-Id: If538c93ec5f889bdddd8c69ca5f8e8876b1e91db
2019-01-29 21:49:30 -08:00
SzuWei Lin a4dabb3050 Merge "Add gsi_common.mk"
am: 59fa4ca993

Change-Id: I5d329e28b556e55f40817fce04aa4e363c742674
2019-01-29 21:45:18 -08:00
Victor Hsieh c9d66874f0 Merge "Rename preferCodeIntegrity to useEmbeddedDex" am: 423be675eb
am: a042ad0670

Change-Id: I7db9d21a8d8056c3b278e8ee272c97780b8fb194
2019-01-29 21:37:38 -08:00
Treehugger Robot 59fa4ca993 Merge "Add gsi_common.mk" 2019-01-30 05:32:53 +00:00
Victor Hsieh a042ad0670 Merge "Rename preferCodeIntegrity to useEmbeddedDex"
am: 423be675eb

Change-Id: Ibb7bde4e6e3e85d4c82378f921d93419e1ccce1c
2019-01-29 21:25:14 -08:00