Commit graph

49620 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
2b4f80bb83 Merge "Improve consistency of indentation in Makefile" am: 715a6c4c80 am: 28a2d69418
am: 8c450db763

Change-Id: I78e37b3e2149d7d7570e11a1de6fa6af30379e9d
2018-11-28 02:53:26 -08:00
Anton Hansson
8c450db763 Merge "Improve consistency of indentation in Makefile" am: 715a6c4c80
am: 28a2d69418

Change-Id: Icd683149d50e710937e16daccbee2ee2fdf05810
2018-11-28 02:40:14 -08:00
Anton Hansson
28a2d69418 Merge "Improve consistency of indentation in Makefile"
am: 715a6c4c80

Change-Id: Ib7190049ad421f8d9c566d1d644a250f69b22ce8
2018-11-28 02:32:05 -08:00
Anton Hansson
715a6c4c80 Merge "Improve consistency of indentation in Makefile" 2018-11-28 10:15:53 +00:00
Miao Wang
9f26bd5613 Merge "Correctly configure armv8-2a for 32-bit" am: e9bb6ca05b am: b4cd6b65a7
am: 8c83935574

Change-Id: Id7416c84a9a1264e65d3a1869e61e98bad0d2016
2018-11-27 17:23:16 -08:00
Miao Wang
8c83935574 Merge "Correctly configure armv8-2a for 32-bit" am: e9bb6ca05b
am: b4cd6b65a7

Change-Id: I7883243237716a7021a88b2701955e0b19706810
2018-11-27 17:15:16 -08:00
Miao Wang
b4cd6b65a7 Merge "Correctly configure armv8-2a for 32-bit"
am: e9bb6ca05b

Change-Id: I9e955db361a60b6c014c339c47ef94dc5651c63c
2018-11-27 17:11:15 -08:00
Yifan Hong
8f5fe554fc Merge "Infer prebuilt image size" am: 08d07f5aa9 am: f462760510
am: b57948b666

Change-Id: I8413ba1329481b4e45631d25dbd602ab99ef384e
2018-11-27 17:01:59 -08:00
Yifan Hong
b57948b666 Merge "Infer prebuilt image size" am: 08d07f5aa9
am: f462760510

Change-Id: I3fc69f560370d30d4c87a4871c9f152d191ed979
2018-11-27 16:53:43 -08:00
Treehugger Robot
e9bb6ca05b Merge "Correctly configure armv8-2a for 32-bit" 2018-11-28 00:53:11 +00:00
Yifan Hong
f462760510 Merge "Infer prebuilt image size"
am: 08d07f5aa9

Change-Id: Ic7e1d23bf931a1ea0aeffe531becd453ab117ec7
2018-11-27 16:47:41 -08:00
Treehugger Robot
08d07f5aa9 Merge "Infer prebuilt image size" 2018-11-28 00:36:50 +00:00
Matthew Ng
0e5ca198e3 More options to mix floating and nav bar height overlays (2/2)
Before slim buttons and floating were mutually exclusive, now they can
both be enabled as overlays so floating with a slim nav height can
occur.

Bug: 112934365
Test: manual
Change-Id: I34029973b968de725dc918f4ccfcdb12854bccd8
2018-11-27 15:01:48 -08:00
Ivan Lozano
f9f03e0119 Disable AArch64 XOM when not using lld.
AArch64 execute-only memory is only supported when using lld as the
linker. There's still a few modules which don't use lld, so in those
cases we need to disable this option.

Bug: 77958880
Test: Module with LOCAL_USE_CLANG_LLD false builds without XOM
Test: Module without LOCAL_USE_CLANG_LLD defined builds with XOM

Change-Id: I5dfe3cd1e1cac2b3ead13912af9f7fe896d507e9
2018-11-27 14:53:33 -08: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
5405eed896 [automerger skipped] Merge changes from topic "RADIO_HAL_MIGRATE" am: 7f3d46e46d am: 08ac70695f
am: 8beac8f93f  -s ours

Change-Id: I53c8e7a8c312cd44a8e132aa13e979579ccffba0
2018-11-27 13:50:12 -08:00
Xiangyu/Malcolm Chen
8beac8f93f Merge changes from topic "RADIO_HAL_MIGRATE" am: 7f3d46e46d
am: 08ac70695f

Change-Id: I838d7f29fb5d59bc5febccfb380e966a56599fa4
2018-11-27 13:32:03 -08:00
Xiangyu/Malcolm Chen
08ac70695f Merge changes from topic "RADIO_HAL_MIGRATE"
am: 7f3d46e46d

Change-Id: I4702b9c6531423f72d8dc025aedfa46414dfac09
2018-11-27 13:14:48 -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
Kevin Rocard
ede0ba0c3b Audio VNDK: add V5 HIDL libraries
Bug: 118203066
Test: compile
Change-Id: I830f9fac7a3a99f06b2112ae844bf7b3f6ad2889
Signed-off-by: Kevin Rocard <krocard@google.com>
2018-11-27 18:53:36 +00:00
Malcolm Chen
5866daa950 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
2018-11-27 18:51:12 +00:00
Xiangyu/Malcolm Chen
78e06ceaad Merge "Adding IRadio 1.4 to vndk current.txt" 2018-11-27 18:50:42 +00:00
Kevin Rocard
343004b888 Audio VNDK: remove legacy HAL shim
The audio shim were never intended to be part of the VNDK,
they are not ABI stable (as they are a shim to a non ABI stable legacy
API) and provide no value as are just a set of simple helper functions.

Bug: 118203066
Test: compile
Change-Id: Ie6f14dc314c46cf8f29ba8dfd872942cda78bca8
Signed-off-by: Kevin Rocard <krocard@google.com>
2018-11-27 18:50:07 +00:00
Anton Hansson
bd2af2ecd8 Merge "Add two more libraries to mainline_system" am: 159eb0938b am: 4daf6aeee0
am: 02d57864c3

Change-Id: Ib43d402b2ca7e54dad53407bf60ddf9aae1eaf3e
2018-11-27 01:19:44 -08:00
Anton Hansson
02d57864c3 Merge "Add two more libraries to mainline_system" am: 159eb0938b
am: 4daf6aeee0

Change-Id: Iaf5b47d23a8f11a5cad33f2018b0c76ebc1f45ed
2018-11-27 01:11:29 -08:00
Anton Hansson
4daf6aeee0 Merge "Add two more libraries to mainline_system"
am: 159eb0938b

Change-Id: If9910175109920f584244539f35cf9f1438d7233
2018-11-27 01:03:18 -08:00
Anton Hansson
159eb0938b Merge "Add two more libraries to mainline_system" 2018-11-27 08:53:29 +00:00
Steven Moreland
bfaaafef6b Merge "safe_union@1.0 to vndk-sp" am: b304fd0509 am: 8afcf3a2fc
am: 9a16b6827f

Change-Id: I4bd5cf6f6fd0bbf16b5764b9174bc2622177a636
2018-11-26 18:38:14 -08:00
Steven Moreland
9a16b6827f Merge "safe_union@1.0 to vndk-sp" am: b304fd0509
am: 8afcf3a2fc

Change-Id: I5b08cf815bc4ea792cb4c51a40c88f1614746f40
2018-11-26 18:22:11 -08:00
Steven Moreland
8afcf3a2fc Merge "safe_union@1.0 to vndk-sp"
am: b304fd0509

Change-Id: Icf3c4af93bc12292f1ef382afc956fe75e3f9ab1
2018-11-26 17:58:13 -08:00
Steven Moreland
b304fd0509 Merge "safe_union@1.0 to vndk-sp" 2018-11-27 01:20:55 +00:00
Malcolm Chen
fb74977c6c 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
2018-11-26 23:28:39 +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
8ea0d7ac2f Merge "Use common.RunAndCheckOutput() in add_img_to_target_files.py." am: f21a8f5376 am: 132f6c8a2e
am: 7a1617c529

Change-Id: I3071820d96c048fd37fed7e7f1dabcecb4babe61
2018-11-26 11:02:45 -08:00
Tao Bao
7a1617c529 Merge "Use common.RunAndCheckOutput() in add_img_to_target_files.py." am: f21a8f5376
am: 132f6c8a2e

Change-Id: I5a93a034ef486e9dde544e792780d073b317c0e9
2018-11-26 10:58:32 -08:00
Tao Bao
132f6c8a2e Merge "Use common.RunAndCheckOutput() in add_img_to_target_files.py."
am: f21a8f5376

Change-Id: I1c6606023008b0d22965066aceec55de7f25fb8f
2018-11-26 10:54:15 -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
ff18a30fa4 Merge "Add support for TARGET_PRODUCT_PROP" am: 5d218a123f am: ead72a4b37
am: 96824c9c39

Change-Id: I2c510c50355bee1d0f9635c2f040625140829ff3
2018-11-26 10:12:27 -08: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
96824c9c39 Merge "Add support for TARGET_PRODUCT_PROP" am: 5d218a123f
am: ead72a4b37

Change-Id: I6ab000990044d44a833d925dfb397d691b3ef3e9
2018-11-26 10:08:18 -08:00
Anton Hansson
ead72a4b37 Merge "Add support for TARGET_PRODUCT_PROP"
am: 5d218a123f

Change-Id: I23e733a72ffd60f36fa65d9face290f1e31167e6
2018-11-26 10:00:07 -08: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
7d96afcdba Merge "dynamic_partition_use -> use_dynamic_partitions." am: 9b024fe583 am: 0d69a1372a
am: 50a144b7fe

Change-Id: Icfe610d531f4fd8c29739d8276cefe95ddded475
2018-11-21 16:46:46 -08:00