Commit Graph

50566 Commits

Author SHA1 Message Date
Ivan Lozano 7257cb9d84 Add mediacodec.policy to the mainline system.
Bug: 110363419
Bug: 116668460
Test: make -j
Change-Id: I557f99fe463435a78c6b803b08b944574319f0a9
2019-01-17 16:23:41 -08:00
Yifan Hong 9780b8c1e4 Merge "Generate OTA for non-A/B devices with dynamic partitions" am: 885787f4d3 am: 4b0f34da5d
am: 7f7e2635cb

Change-Id: I5eb4228d4545f056772e1be5827a4df2ce49c2e4
2019-01-16 11:04:05 -08:00
Android Build Merger (Role) 8b6faaa14c Merge "Merge "build_image: right-sizing at least some spare inode" am: f2f1854ca4 am: f92eb52866 am: 34c0af7a11" 2019-01-16 19:01:50 +00:00
Anil Admal 214c084ba7 Merge "Non-framewok location access visibility and control (VNDK)" 2019-01-16 19:01:42 +00:00
Mark Salyzyn 33e3c26cfd Merge "build_image: right-sizing at least some spare inode" am: f2f1854ca4 am: f92eb52866
am: 34c0af7a11

Change-Id: Ia5322176bd51b8728dc1a724327616a243de8670
2019-01-16 11:01:37 -08:00
Yifan Hong 7f7e2635cb Merge "Generate OTA for non-A/B devices with dynamic partitions" am: 885787f4d3
am: 4b0f34da5d

Change-Id: I76ad575bf821f693b2879af5926ffd8abe73fc7e
2019-01-16 10:58:14 -08:00
Mark Salyzyn 34c0af7a11 Merge "build_image: right-sizing at least some spare inode" am: f2f1854ca4
am: f92eb52866

Change-Id: I80f5a8b6b53a043ff8e2b1ac0717dd19b43ea981
2019-01-16 10:56:25 -08:00
Yifan Hong 4b0f34da5d Merge "Generate OTA for non-A/B devices with dynamic partitions"
am: 885787f4d3

Change-Id: I3df4f51fbb8111b0e6b0845921cd7949e5771c4c
2019-01-16 10:50:59 -08:00
Mark Salyzyn f92eb52866 Merge "build_image: right-sizing at least some spare inode"
am: f2f1854ca4

Change-Id: I14a099d227eb69dd595e58c641bb29181c2be9d5
2019-01-16 10:49:21 -08:00
Yifan Hong 885787f4d3 Merge "Generate OTA for non-A/B devices with dynamic partitions" 2019-01-16 18:42:58 +00:00
Mark Salyzyn f2f1854ca4 Merge "build_image: right-sizing at least some spare inode" 2019-01-16 18:36:58 +00:00
Mark Salyzyn c25b2bf458 build_image: right-sizing at least some spare inode
To address problems creating real tiny filesystem placeholders,
make sure extra spare inodes margin is greater than 0.
For initial estimate we add 4% of total we request at least 8.
For second pass estimate we add 0.2% of total we request at least 1.

We bumped up the margin for zie on the second pass to 0.3% as the
value was too close on one of the builds.

Test: build
Bug: 122328872
Change-Id: I41707bb6fcc8bbfbdda143a9ce62446cad9c1533
2019-01-16 09:54:31 -08:00
Anton Hansson f4e9102ea8 Merge "Set TARGET_COPY_OUT_ for product/vendor in mainline" am: 9a0dd5b288 am: dae8049421
am: 8dad70660d

Change-Id: Ib9eae63af430c2751093cfc731145139b708e421
2019-01-16 09:09:38 -08:00
Anton Hansson 8dad70660d Merge "Set TARGET_COPY_OUT_ for product/vendor in mainline" am: 9a0dd5b288
am: dae8049421

Change-Id: I1d4f24d68ed3fbc626ecbe1ac7db448e1ae559a6
2019-01-16 09:03:27 -08:00
Anton Hansson dae8049421 Merge "Set TARGET_COPY_OUT_ for product/vendor in mainline"
am: 9a0dd5b288

Change-Id: I1dc2536767eb7c2a294a2359f1b6c47444f0dfe0
2019-01-16 08:57:14 -08:00
Anton Hansson 3c19cb6de5 Merge "Add webview to mainline whitelist" am: 3fc20bd7d9 am: e360c96bc2
am: ba02d77619

Change-Id: I0e5bc4dd361cbc66126d57555689ff2c051fc9dd
2019-01-16 08:53:34 -08:00
Anton Hansson 9a0dd5b288 Merge "Set TARGET_COPY_OUT_ for product/vendor in mainline" 2019-01-16 16:53:01 +00:00
Anton Hansson ba02d77619 Merge "Add webview to mainline whitelist" am: 3fc20bd7d9
am: e360c96bc2

Change-Id: I23ed2e7bc67e0e1591b00b6746b3c5f9e58ab6ec
2019-01-16 08:49:18 -08:00
Anton Hansson e360c96bc2 Merge "Add webview to mainline whitelist"
am: 3fc20bd7d9

Change-Id: I04597582695ae085a879a203aea8f1df49ecef27
2019-01-16 08:40:05 -08:00
SzuWei Lin db1f5ee1e3 [automerger skipped] Merge "Split *_product makefiles" am: 0735b4f9fe am: 61ef97cb79
am: 41b13251e3 -s ours
am skip reason: change_id I79aefdd1971b3b5724a3ec858de4109b645c765a with SHA1 2ccd37eeb3 is in history

Change-Id: I3a2f626cd3c01eb959f19e14b1370fff9b61ff4a
2019-01-16 08:35:36 -08:00
Anton Hansson 3fc20bd7d9 Merge "Add webview to mainline whitelist" 2019-01-16 16:31:50 +00:00
SzuWei Lin 41b13251e3 Merge "Split *_product makefiles" am: 0735b4f9fe
am: 61ef97cb79

Change-Id: Icc679ba9c269a0004171f82eb0c90d69c90b0938
2019-01-16 08:17:51 -08:00
SzuWei Lin 61ef97cb79 Merge "Split *_product makefiles"
am: 0735b4f9fe

Change-Id: I4258af36e153acc7ef752059adab4810f3fd224e
2019-01-16 07:33:09 -08:00
Treehugger Robot 0735b4f9fe Merge "Split *_product makefiles" 2019-01-16 15:18:37 +00:00
SzuWei Lin caa5e88d4a Split *_product makefiles
So far, we have *_system.mk and *_vendor.mk.
This patch split all product settings from *_vendor.mk to new
*_product.mk

This patch also create a new telephony.mk to include all
telephony_*.mk

Bug: 119747870
Test: lunch mainline_arm64-user; make -j
Test: compare the content with and without the patch
Test: the output files in out folder are the same
Change-Id: I79aefdd1971b3b5724a3ec858de4109b645c765a
Merged-In: I79aefdd1971b3b5724a3ec858de4109b645c765a
2019-01-16 22:23:35 +08:00
Anton Hansson 9791518d58 Set TARGET_COPY_OUT_ for product/vendor in mainline
This product variable is used to generate the loader config (to use
either /system/product or /product), and the vendor one is likely
used in similar ways. Having these partitions is required for mainline
devices, so set it in the shared BoardConfig.

Bug: 80410283
Test: make
Change-Id: I6f2d94ff43572a28df54ea8c60f2d838a3b9216c
2019-01-16 13:32:51 +00:00
Anton Hansson 0a5d5fec2e Add webview to mainline whitelist
The app will move to product soon, but temporarily
whitelist that mainline_arm64 adds it to /system.

Test: make
Change-Id: I7b0ce5623a160bcb0f8b89f3053a007019ff0b62
2019-01-16 13:31:02 +00:00
TreeHugger Robot 6622ea852b Merge "Change the impl lib name of java_sdk_library" 2019-01-16 10:47:25 +00:00
Anton Hansson cd7175d792 Merge "Remove webview from media_system.mk" am: e7f127491a am: 50ac1cb858
am: 513c0bc90c

Change-Id: I2d2aa70a509c5e916829284d5ddd53a9ef440d15
2019-01-16 02:09:00 -08:00
Anton Hansson 513c0bc90c Merge "Remove webview from media_system.mk" am: e7f127491a
am: 50ac1cb858

Change-Id: I9248570532445e70f624daf91376aa05cb53989a
2019-01-16 01:57:49 -08:00
Anton Hansson 50ac1cb858 Merge "Remove webview from media_system.mk"
am: e7f127491a

Change-Id: I60b176aacf906ec30c26d2e4410b45b0e628a445
2019-01-16 01:51:39 -08:00
Anton Hansson e7f127491a Merge "Remove webview from media_system.mk" 2019-01-16 09:44:39 +00:00
Jeongik Cha b8231cb3e3 Merge "Execute appcompat for apps built from soong" am: d6dbd967b5 am: 7808358cf1
am: 6d4e72069b

Change-Id: I12ec0cfa24ad5cc73e2bb1f0cb5fe7f94f16028c
2019-01-16 01:09:27 -08:00
Jeongik Cha 6d4e72069b Merge "Execute appcompat for apps built from soong" am: d6dbd967b5
am: 7808358cf1

Change-Id: I20f3cfe6449bc99b69629bd3fadcbf7bc01537c5
2019-01-16 01:05:13 -08:00
Jeongik Cha 7808358cf1 Merge "Execute appcompat for apps built from soong"
am: d6dbd967b5

Change-Id: I6b261f50081e80eb357aecba683a2ffae82bc554
2019-01-16 01:01:05 -08:00
Treehugger Robot d6dbd967b5 Merge "Execute appcompat for apps built from soong" 2019-01-16 08:53:48 +00:00
Jeongik Cha f712ce79f5 Execute appcompat for apps built from soong
Appcompat runs for app defined in Android.mk, but not in Android.bp
So make appcompat run for app from soong(Android.bp)

Bug: 110073830
Bug: 122026042

Test: m out/target/product/$(get_build_var TARGET_DEVICE)/appcompat.zip

Change-Id: I73832410ec5850222b04086c2a377146886ba035
2019-01-16 14:27:21 +09:00
TreeHugger Robot 267a15129b Merge "Load sw C2 codecs from apex" 2019-01-16 03:05:37 +00:00
Colin Cross 75c1e7f993 Merge "Revert "Simplify soong_java_prebuilt.mk and soong_app_prebuilt.mk"" am: 371f557f8e am: 33dab51b25
am: b7c03f016d

Change-Id: Ifc8d317a282dc0c14c40f7ffa766ca5892150ebb
2019-01-15 18:21:57 -08:00
Colin Cross b7c03f016d Merge "Revert "Simplify soong_java_prebuilt.mk and soong_app_prebuilt.mk"" am: 371f557f8e
am: 33dab51b25

Change-Id: Ib5aaa80c0a2a22a2bca787dbb9065cb23d52a295
2019-01-15 17:58:13 -08:00
Colin Cross 33dab51b25 Merge "Revert "Simplify soong_java_prebuilt.mk and soong_app_prebuilt.mk""
am: 371f557f8e

Change-Id: I0ba059579bd7c5e7b5b8f78d4592b02a92d2dfa4
2019-01-15 17:54:06 -08:00
Colin Cross 371f557f8e Merge "Revert "Simplify soong_java_prebuilt.mk and soong_app_prebuilt.mk"" 2019-01-16 01:41:01 +00:00
Colin Cross 5d196364e1 Revert "Simplify soong_java_prebuilt.mk and soong_app_prebuilt.mk"
This reverts commit a76cc6d732.

Reason for revert: broke emma turbine build

Change-Id: Ie894565501d0de44f96dc736408a8c4e2ba2ed90
2019-01-16 01:38:41 +00:00
Colin Cross 25e4bd000e Merge "Simplify soong_java_prebuilt.mk and soong_app_prebuilt.mk" am: 8bc94444eb am: 725de55d03
am: bb9bc43f1a

Change-Id: Ie19dfc9e5990fce55e727d254230849be29b2d53
2019-01-15 16:23:44 -08:00
Colin Cross bb9bc43f1a Merge "Simplify soong_java_prebuilt.mk and soong_app_prebuilt.mk" am: 8bc94444eb
am: 725de55d03

Change-Id: I5c8872ea19fdcc96da336db5cbe2f1e58be56742
2019-01-15 16:19:19 -08:00
Ivan Lozano a2bd57813e Merge "Enable execute-only memory layouts by default." am: 77cd60adcb am: b8b096a569
am: 0679bddedd

Change-Id: I78e8efc6e6558f33b90dad5173c882e9d6f6c819
2019-01-15 16:09:08 -08:00
Colin Cross 725de55d03 Merge "Simplify soong_java_prebuilt.mk and soong_app_prebuilt.mk"
am: 8bc94444eb

Change-Id: I2fd9c7270314a90c160c27a97c0588b690303880
2019-01-15 16:08:54 -08:00
Yifan Hong 10c530d20a Generate OTA for non-A/B devices with dynamic partitions
Test: sideload full OTA on cuttlefish
Test: sideload incremental OTA on cuttlefish (that grows
      system, shrinks vendor, and move vendor to group foo)

Bug: 111801737

Change-Id: Ie8a267a90b4df9e9e0a2fbcc1b582ab2e353df52
2019-01-15 16:04:12 -08:00
Howard Chen d136972d48 Merge "Add gsid" am: a72cc8f038 am: 4c28a7da14
am: a7a078194c

Change-Id: I45c0d153824e3bca3b116aa7baa71e96df4e1439
2019-01-15 15:59:05 -08:00
Ivan Lozano 0679bddedd Merge "Enable execute-only memory layouts by default." am: 77cd60adcb
am: b8b096a569

Change-Id: I9be726e692c74445552b2cb266c2679e133c7b98
2019-01-15 15:53:43 -08:00