Commit graph

47490 commits

Author SHA1 Message Date
Dan Albert
638ca85aec Merge "Don't use libandroid_support post-21." 2018-11-28 16:19:01 +00:00
Anton Hansson
715a6c4c80 Merge "Improve consistency of indentation in Makefile" 2018-11-28 10:15:53 +00:00
Treehugger Robot
e9bb6ca05b Merge "Correctly configure armv8-2a for 32-bit" 2018-11-28 00:53:11 +00:00
Treehugger Robot
08d07f5aa9 Merge "Infer prebuilt image size" 2018-11-28 00:36:50 +00:00
Miao Wang
62c2390a55 Correctly configure armv8-2a for 32-bit
Bug: 119681317
Test: mm
Test: CtsRenderscriptTestCases
Change-Id: I455c94948430d3cc2dd320cce830ae18be6a93cd
2018-11-27 14:05:48 -08:00
Dan Albert
e6d958aed7 Don't use libandroid_support post-21.
Test: m checkbuild
Bug: http://b/119587551
Change-Id: If3a3556ad27e632778efda43da8384a40eedee5a
2018-11-27 13:59:28 -08:00
Xiangyu/Malcolm Chen
7f3d46e46d Merge changes from topic "RADIO_HAL_MIGRATE"
* changes:
  Adding IRadioConfig 1.2 to current.txt.
  Adding IRadio 1.4 to vndk current.txt
2018-11-27 21:00:42 +00:00
Malcolm Chen
07fdc21766 Adding IRadioConfig 1.2 to current.txt.
To better test CBRS, we want IRadio 1.1 to be Android P plus CBRS
HAL interfaces, while 1.2 will be 1.1 plus all other Android Q
interfaces. So we are creating V1_2 folder and moving everything
currently defined in android.hardware.radio.config.V1_1 there.

Bug: 117805040
Test: build and telephony unittest
Change-Id: Icf208036385d1d9994d07fe7d839b290f2234622
Merged-In: Icf208036385d1d9994d07fe7d839b290f2234622
2018-11-27 19:36:05 +00:00
Yifan Hong
70fc029ab8 Infer prebuilt image size
Test: call script twice; the second time uses prebuilts
Fixes: 119769527

Change-Id: Icd98a4dbfed91538cbc07aab957c7b042c05b330
2018-11-27 11:21:21 -08:00
Malcolm Chen
916106972d Adding IRadio 1.4 to vndk current.txt
To better test CBRS, we want IRadio 1.3 to be Android P plus CBRS
HAL interfaces, while 1.4 will be 1.3 plus all other Android Q
interfaces. So we are creating V1_4 folder and moving everything
currently defined in android.hardware.radio.V1_3 there.

Bug: 117805040
Test: build and telephony unittest
Change-Id: I0a0c651b25caa4d0bd88bf51c02a9f7160d0caff
Merged-In: I0a0c651b25caa4d0bd88bf51c02a9f7160d0caff
2018-11-27 19:14:18 +00:00
Anton Hansson
159eb0938b Merge "Add two more libraries to mainline_system" 2018-11-27 08:53:29 +00:00
Steven Moreland
b304fd0509 Merge "safe_union@1.0 to vndk-sp" 2018-11-27 01:20:55 +00:00
Steven Moreland
62da89ca75 safe_union@1.0 to vndk-sp
This is a types-only HAL used by any HAL as a convenient primitive for
effectively using safe_union, so it should be able to be
double-loadable.

Bug: 119790516
Test: build and boot walleye
Change-Id: I8f48ec6e3a0f47bfd5bb90d8c496848fbed85687
2018-11-26 12:24:32 -08:00
Tao Bao
f21a8f5376 Merge "Use common.RunAndCheckOutput() in add_img_to_target_files.py." 2018-11-26 18:41:36 +00:00
Anton Hansson
6d81498baf Improve consistency of indentation in Makefile
Only use one consecutive tab in make rules and use spaces
for any additional indentation. This should generally prevent
tabs from appearing on the cmdline.

This cl is the result of 3 regex replaces:
\\\n\t\t([^\t]) -> \\\n\t    \1
\\\n\t\t\t([^\t]) -> \\\n\t        \1
\\\n\t\t\t\t([^\t]) -> \\\n\t            \1

Test: make mainline_system_arm64
Change-Id: Ic3f72deed35e39e4b1a4b492db65aeabc5bef0d5
2018-11-26 18:12:05 +00:00
Anton Hansson
5d218a123f Merge "Add support for TARGET_PRODUCT_PROP" 2018-11-26 17:51:13 +00:00
Anton Hansson
1f6e024bcc Add two more libraries to mainline_system
Bug: 80410283
Test: make
Change-Id: I479396b24b1a551afd591da9f4f550eb0a74b540
2018-11-26 17:08:07 +00:00
Anton Hansson
e9ee80e24a Add support for TARGET_PRODUCT_PROP
Like TARGET_SYSTEM_PROP, but is merged into /product/build.prop.

Also change the formatting of the output of both of these macros
slightly, so make the start and end clearer.

Bug: 119911662
Test: migrate downstream products to use this
Change-Id: Iddae7aac3c51b5706f3fb2690c5ca5a98840ad34
2018-11-22 15:27:35 +00:00
Yifan Hong
9b024fe583 Merge "dynamic_partition_use -> use_dynamic_partitions." 2018-11-22 00:19:56 +00:00
Ivan Lozano
53ef500604 Merge "Add support for AArch64 XOM binaries." 2018-11-21 22:20:53 +00:00
Yifan Hong
50611038e9 dynamic_partition_use -> use_dynamic_partitions.
Test: build OTA package
Change-Id: Ia43d23f49fc024ecc767da1c2186c4b446c034de
2018-11-21 13:00:57 -08:00
Tao Bao
2764aee664 Use common.RunAndCheckOutput() in add_img_to_target_files.py.
Test: `m dist` with aosp_marlin-userdebug
Test: python -m unittest test_add_img_to_target_files.py
Change-Id: Icff60a44e5c189c2443fbaba3fc6a2b106b409ea
2018-11-21 11:04:32 -08:00
Ivan Lozano
fda9a6f38e Add support for AArch64 XOM binaries.
Adds build system support for generating AArch64 binaries with
execute-only memory layouts via a new LOCAL_XOM property. Also adds
support for an ENABLE_XOM build flag for global builds.

Bug: 77958880
Test: make -j ENABLE_XOM=true
Change-Id: I6af9e3615d0a9fdff802eae50e6ad94311ec8046
2018-11-21 09:05:08 -08:00
Anton Hansson
12fa690ff6 Merge "Add a bunch of libraries to mainline_system" 2018-11-21 10:16:24 +00:00
Treehugger Robot
01284abf21 Merge changes from topic "dp_sysprop"
* changes:
  ro.boot.dynamic_partitions: fix empty values
  Remove ro.boot.logical_partitions
2018-11-21 07:39:21 +00:00
Treehugger Robot
b906ebb313 Merge "PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS: allow inheritance" 2018-11-21 00:41:44 +00:00
Yifan Hong
4a37a03758 ro.boot.dynamic_partitions: fix empty values
When PRODUCT_RETROFIT_DYNAMIC_PARTITIONS is empty, collapse-pairs will
write this line to build.prop:
ro.boot.dynamic_partitions=ro.boot.dynamic_partitions_retrofit=

... which is not what we want.
Test: build without dynamic partitions

Change-Id: I04c3c75fad20604657814b7f9cce2cc0635627ee
2018-11-20 16:06:17 -08:00
Yifan Hong
284b2b9fc9 Remove ro.boot.logical_partitions
Test: boots
Bug: 119286600
Change-Id: I0606c3989588de3afaacc170943eaca82c682085
2018-11-20 16:06:17 -08:00
Yifan Hong
d585de5933 Merge changes from topic "dp_retrofit_gen"
* changes:
  Generate retrofit OTA.
  Add split super images to target_files.
2018-11-20 22:44:06 +00:00
Treehugger Robot
fec2671f00 Merge "Fix size checks for retrofit dynamic partitions." 2018-11-20 22:30:56 +00:00
Yifan Hong
452d9267fc PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS: allow inheritance
Test: with this is true, build
     `verified_assembled_system_matrix.xml`;
      file includes kernel requirements
Change-Id: I833b4fefabefb2f0457171055afe5722981e3589
2018-11-20 11:50:52 -08:00
Yifan Hong
50e7954ac9 Generate retrofit OTA.
Test: m otapackage -j, manual apply on top of P
Bug: 118506262

Change-Id: Iedc389a1058007a604de0482f2348a9ef0d5892a
2018-11-20 11:17:39 -08:00
Yifan Hong
c767f7cbfc Add split super images to target_files.
Test: build target files package
Bug: 118506262
Change-Id: Iee6143987c9bfa6f2d287e20c06ea5ef25e82985
2018-11-20 11:17:39 -08:00
Anton Hansson
6d8a179cf1 Add a bunch of libraries to mainline_system
These are libraries commonly depended on by things on the product
partition. Add them explicitly for now.

Bug: 80410283
Test: build mainline_system_arm64
Change-Id: I6696990243397aa7109f88951ff120acf2a0f7e8
2018-11-20 14:53:09 +00:00
Anton Hansson
6f2cfd93d8 Merge "Add BOARD_USES_SYSTEM_OTHER_ODEX := true to mainline" 2018-11-20 10:05:27 +00:00
Dan Willemsen
38d08510f8 Merge changes from topics "iproute2-soong", "iw-soong"
* changes:
  Add ss as a previously debug tagged module
  Add iw as a previously debug tagged module
2018-11-20 06:27:16 +00:00
Treehugger Robot
8bd7918a28 Merge "Remove PRODUCT_USE_LOGICAL_PARTITIONS." 2018-11-20 04:06:53 +00:00
Dan Willemsen
66a468a772 Add ss as a previously debug tagged module
From external/iproute2

Test: check installed files on debug builds
Change-Id: Ie2e1fc927f636602b1285f8b0e62a926d538b150
2018-11-20 03:08:19 +00:00
Dan Willemsen
cf0a2169d0 Add iw as a previously debug tagged module
From external/iw

Test: check installed files on debug builds
Change-Id: Ie1282e88dfee47f958e13fd7ec17163f1178cb22
2018-11-20 03:08:07 +00:00
Yifan Hong
7416b8d143 Remove PRODUCT_USE_LOGICAL_PARTITIONS.
Use PRODUCT_USE_DYNAMIC_PARTITIONS instead.
Test: boots
Fixes: 119286600

Change-Id: I5c0828eac2b6c579edbb494b150bc586b3b576f1
2018-11-20 00:34:30 +00:00
Treehugger Robot
614e1e806e Merge "Remove androidboot.logical_partitions kernel cmdline" 2018-11-20 00:30:05 +00:00
Yifan Hong
426e029980 Remove androidboot.logical_partitions kernel cmdline
Flag is not used anymore.
Fixes: 119286600
Test: boots

Change-Id: I47370369ccde6d504ea0c936a179c4a325302f8b
2018-11-19 22:38:35 +00:00
Yifan Hong
f39d8af57e Fix size checks for retrofit dynamic partitions.
Now that we have two supers for retrofit devices, modify
the size checks. Only A/B devices launched with dynamic partitions
will get the / 2.

Test: builds
Bug: 116608795
Change-Id: Icdddcc0b3f3be307b3907e1c789933c2ace61867
2018-11-19 14:37:45 -08:00
Treehugger Robot
b82b51e0b9 Merge "Add cpu variant information to vendor/default.prop" 2018-11-19 21:37:32 +00:00
Haibo Huang
ee0531da7a Add cpu variant information to vendor/default.prop
Test: build and check vendor/default.prop
Change-Id: I8d86d58c72118c7dda65e75d09680e20c9428c24
2018-11-19 18:57:36 +00:00
Treehugger Robot
c6434d43ec Merge "Sort output in dump-files" 2018-11-19 17:43:00 +00:00
Treehugger Robot
25d43708c8 Merge "fs_config: fix fs_config_*_system targets" 2018-11-19 15:15:33 +00:00
Mark Salyzyn
705b59e155 fs_config: fix fs_config_*_system targets
Content from fs_config designated for other partitions is leaking
into the system fs_config_* files.  Notably /vendor is showing up.

Rule expansion happens late, after all parsing.  This is the same in
make and kati.  build/make/tools/fs_config/Android.mk ends with
fs_config_generate_extra_partition_list :=, so by the time you get to
rule expansion the value is empty.

Added a PRIVATE_PARTITION_LIST variable to record the value of
fs_config_generate_extra_partition-list.

Test: inspect result of ${OUT}/product/*/system/etc/fs_config_files
Bug: 119677224
Bug: 119310326
Change-Id: I968b4936ab2c5d174f164c760820af13434654ca
2018-11-19 07:14:54 -08:00
Anton Hansson
41b53a3c19 Sort output in dump-files
Makes it less frustrating to use.

Test: m dump-files
Change-Id: I84801f37e2e40a37d65d3f9ce7b19a84f3381a53
2018-11-19 14:33:19 +00:00
Treehugger Robot
7320a023ea Merge changes from topic "iputils-soong"
* changes:
  Add previously debug tagged modules
  Add sanitizer-status to PRODUCT_PACKAGES_DEBUG
2018-11-19 00:32:44 +00:00