Commit graph

1394 commits

Author SHA1 Message Date
Roshan Pius
0366ae7efd Merge "Fix static_assert compile issue" am: 9845354ef7 am: 6b3c4365b6 am: fa72bc1b48
am: 45391d1b76

Change-Id: I4449e6e5e6c93fb71547e7c7ba1fd54479c4a6f6
2017-04-20 18:51:13 +00:00
Dan Willemsen
9cba24de39 Merge "Mark as vendor_available" am: 39a2e208fa am: c985524d71 am: 5465ba3b98 -s ours
am: 206731be50

Change-Id: Ied184b1e3d957ab6d2f53c313a4d35a8742f39d5
2017-04-20 15:54:42 +00:00
Colin Cross
f4ef49163b Merge changes Ic355174a,I8b04ba9e,I3fefb13c am: dd67435bac am: 29745f29b8
am: 1e2b77935c  -s ours

Change-Id: I008e7194d75413748b31977e289c00065de6d67f
2017-04-20 15:45:19 +00:00
Colin Cross
1e2b77935c Merge changes Ic355174a,I8b04ba9e,I3fefb13c am: dd67435bac
am: 29745f29b8

Change-Id: I31e6b092149c3fabe7715277a43e611f3f96648e
2017-04-20 15:16:05 +00:00
Colin Cross
29745f29b8 Merge changes Ic355174a,I8b04ba9e,I3fefb13c
am: dd67435bac

Change-Id: I6a48a4e5d3b0c5cf7ef7a8f808602038979f62af
2017-04-20 15:12:47 +00:00
Colin Cross
dd67435bac Merge changes Ic355174a,I8b04ba9e,I3fefb13c
* changes:
  libhardware_legacy: Android.mk -> Android.bp
  remove legacy audio policy
  libhardware_legacy doesn't need libmedia
2017-04-20 15:06:52 +00:00
Roshan Pius
45391d1b76 Merge "Fix static_assert compile issue" am: 9845354ef7 am: 6b3c4365b6
am: fa72bc1b48

Change-Id: Ia2beec198e15a7be7fd29adc047f8653ba4b47f2
2017-04-20 08:13:30 +00:00
Roshan Pius
fa72bc1b48 Merge "Fix static_assert compile issue" am: 9845354ef7
am: 6b3c4365b6

Change-Id: Ic5414a92c32b24be94ed51465c9a344c070a0cd0
2017-04-20 08:01:45 +00:00
Roshan Pius
6b3c4365b6 Merge "Fix static_assert compile issue"
am: 9845354ef7

Change-Id: Ie3b44c59244222cc63cdc72cf0f54f4b78466df8
2017-04-20 07:59:46 +00:00
Roshan Pius
9845354ef7 Merge "Fix static_assert compile issue" 2017-04-20 07:54:10 +00:00
Subhani Shaik
4cc6080b2b Fix static_assert compile issue
Change-Id: Ib8a894a7a766e10a7f8bdd4affbb672ad962690e
2017-04-20 07:54:04 +00:00
Dan Willemsen
206731be50 Merge "Mark as vendor_available" am: 39a2e208fa am: c985524d71
am: 5465ba3b98  -s ours

Change-Id: I2456f69822f1f5f82bef8b8a79011d7d16dc5e49
2017-04-20 04:21:23 +00:00
Dan Willemsen
5465ba3b98 Merge "Mark as vendor_available" am: 39a2e208fa
am: c985524d71

Change-Id: I2637982aa16b7f4ece70522280343fa6bcfdd569
2017-04-20 01:59:16 +00:00
Dan Willemsen
c985524d71 Merge "Mark as vendor_available"
am: 39a2e208fa

Change-Id: I876ba572be5c6ce228a09199a90499d278306c3f
2017-04-20 01:47:57 +00:00
Treehugger Robot
39a2e208fa Merge "Mark as vendor_available" 2017-04-20 01:39:23 +00:00
Dan Willemsen
c8a3eb6764 Mark as vendor_available
By setting vendor_available, the following may become true:

* a prebuilt library from this release may be used at runtime by
  in a later releasse (by vendor code compiled against this release).
  so this library shouldn't depend on runtime state that may change
  in the future.
* this library may be loaded twice into a single process (potentially
  an old version and a newer version). The symbols will be isolated
  using linker namespaces, but this may break assumptions about 1
  library in 1 process (your singletons will run twice).

Background:

This means that these modules may be built and installed twice --
once for the system partition and once for the vendor partition. The
system version will build just like today, and will be used by the
framework components on /system. The vendor version will build
against a reduced set of exports and libraries -- similar to, but
separate from, the NDK. This means that all your dependencies must
also mark vendor_available.

At runtime, /system binaries will load libraries from /system/lib*,
while /vendor binaries will load libraries from /vendor/lib*. There
are some exceptions in both directions -- bionic(libc,etc) and liblog
are always loaded from /system. And SP-HALs (OpenGL, etc) may load
/vendor code into /system processes, but the dependencies of those
libraries will load from /vendor until it reaches a library that's
always on /system. In the SP-HAL case, if both framework and vendor
libraries depend on a library of the same name, both versions will be
loaded, but they will be isolated from each other.

It's possible to compile differently -- reducing your source files,
exporting different include directories, etc. For details see:

https://android-review.googlesource.com/368372

None of this is enabled unless the device opts into the system/vendor
split with BOARD_VNDK_VERSION := current.

Bug: 36426473
Bug: 36079834
Bug: 37343006
Test: Android-aosp_arm.mk is the same before/after
Test: build.ninja is the same before/after
Test: build-aosp_arm.ninja is the same before/after
Test: attempt to compile with BOARD_VNDK_VERSION := current
(cherry picked from commit 703e783e28)
Merged-In: I3f1e4986c5920b4a64768636cb0bc37fa602c7a7
Change-Id: I3f1e4986c5920b4a64768636cb0bc37fa602c7a7
2017-04-19 10:32:26 -07:00
Steven Moreland
4f05655f48 libhardware_legacy: Android.mk -> Android.bp
Test: builds with BOARD_VNDK_VERSION := current
Test: (sanity) Boots and works on internal marlin.
Bug: 33241851
Bug: 29915755
Change-Id: Ic355174a67860afa13377bc9d8f0a140f59ec34e
(cherry picked from commit 4d4047b7e9)
2017-04-18 17:25:31 -07:00
Eric Laurent
9b686eb816 remove legacy audio policy
Test: make.

Change-Id: I8b04ba9e1ab3b3fc22cf1b1baba010664c47ecc6
(cherry picked from commit 136bad9bf4)
2017-04-18 17:25:24 -07:00
Marco Nelissen
a54e14833b libhardware_legacy doesn't need libmedia
Test: build/boot
Change-Id: I3fefb13c0f7a80c2d051271cd0f2a42a1ebf504d
(cherry picked from commit c07bb10021)
2017-04-18 17:24:58 -07:00
Steven Moreland
54d232d5a2 libhardware_legacy: vendor_available am: 477e5978ac
am: bdb2aefd82

Change-Id: I1963ca985349dbfb892b607991f9567ef744c2a2
2017-04-17 23:29:29 +00:00
Steven Moreland
bdb2aefd82 libhardware_legacy: vendor_available
am: 477e5978ac

Change-Id: I8a01e8c8523284fa59d6254b15b141e494e228d4
2017-04-17 23:19:01 +00:00
Steven Moreland
477e5978ac libhardware_legacy: vendor_available
Test: build with BOARD_VNDK_VERSION := current
Change-Id: Iccc3a0301a28de52fc17102d251ce728d372ba5c
2017-04-17 13:38:11 -07:00
Dan Willemsen
883d5bc77b Merge "Mark as vendor_available" into oc-dev am: a8d05433c4
am: c7ccca0445

Change-Id: I16cabd1b56a79b4e0e28c3c75b895e2333c1d82f
2017-04-17 18:31:36 +00:00
Steven Moreland
f8482fb3ae libhardware_legacy: Android.mk -> Android.bp am: 4d4047b7e9
am: 05e4f48c00

Change-Id: I16dfda1c328966461b53b60e58459a8dc55307ba
2017-04-17 18:31:27 +00:00
Dan Willemsen
c7ccca0445 Merge "Mark as vendor_available" into oc-dev
am: a8d05433c4

Change-Id: I6fb59c66a1630b869d93c270aa5b4bb36414233c
2017-04-17 18:26:44 +00:00
Steven Moreland
05e4f48c00 libhardware_legacy: Android.mk -> Android.bp
am: 4d4047b7e9

Change-Id: Ia80a97654f41e49f104905cedefe19eadfd6bedb
2017-04-17 18:26:34 +00:00
TreeHugger Robot
a8d05433c4 Merge "Mark as vendor_available" into oc-dev 2017-04-17 18:10:25 +00:00
Dan Willemsen
703e783e28 Mark as vendor_available
By setting vendor_available, the following may become true:

* a prebuilt library from this release may be used at runtime by
  in a later releasse (by vendor code compiled against this release).
  so this library shouldn't depend on runtime state that may change
  in the future.
* this library may be loaded twice into a single process (potentially
  an old version and a newer version). The symbols will be isolated
  using linker namespaces, but this may break assumptions about 1
  library in 1 process (your singletons will run twice).

Background:

This means that these modules may be built and installed twice --
once for the system partition and once for the vendor partition. The
system version will build just like today, and will be used by the
framework components on /system. The vendor version will build
against a reduced set of exports and libraries -- similar to, but
separate from, the NDK. This means that all your dependencies must
also mark vendor_available.

At runtime, /system binaries will load libraries from /system/lib*,
while /vendor binaries will load libraries from /vendor/lib*. There
are some exceptions in both directions -- bionic(libc,etc) and liblog
are always loaded from /system. And SP-HALs (OpenGL, etc) may load
/vendor code into /system processes, but the dependencies of those
libraries will load from /vendor until it reaches a library that's
always on /system. In the SP-HAL case, if both framework and vendor
libraries depend on a library of the same name, both versions will be
loaded, but they will be isolated from each other.

It's possible to compile differently -- reducing your source files,
exporting different include directories, etc. For details see:

https://android-review.googlesource.com/368372

None of this is enabled unless the device opts into the system/vendor
split with BOARD_VNDK_VERSION := current.

Bug: 36426473
Bug: 36079834
Bug: 37343006
Test: Android-aosp_arm.mk is the same before/after
Test: build.ninja is the same before/after
Test: build-aosp_arm.ninja is the same before/after
Test: attempt to compile with BOARD_VNDK_VERSION := current
Merged-In: I3f1e4986c5920b4a64768636cb0bc37fa602c7a7
Change-Id: I3f1e4986c5920b4a64768636cb0bc37fa602c7a7
2017-04-14 16:42:32 +00:00
Steven Moreland
4d4047b7e9 libhardware_legacy: Android.mk -> Android.bp
Test: builds with BOARD_VNDK_VERSION := current
Test: (sanity) Boots and works on internal marlin.
Bug: 33241851
Bug: 29915755
Change-Id: Ic355174a67860afa13377bc9d8f0a140f59ec34e
2017-04-14 16:05:25 +00:00
Dan Willemsen
0a04146069 Include what you use am: 24230cd423
am: 4741fa1116

Change-Id: I1d1592f887dd057e7ac244b38bf8482bea022f44
2017-04-13 00:07:20 +00:00
Dan Willemsen
4741fa1116 Include what you use
am: 24230cd423

Change-Id: Ide8749e929c598747dc341a9ee58847f988f1dad
2017-04-12 23:46:45 +00:00
Dan Willemsen
562393f6b6 Merge "Include what you use" am: 5a975c703f am: 257a4dde1d am: 69a9ba87a1
am: 2b46e0fe51

Change-Id: I7a041d0b8895a4d21f9af0a3b384989b7740d0f4
2017-04-12 22:55:11 +00:00
Dan Willemsen
2b46e0fe51 Merge "Include what you use" am: 5a975c703f am: 257a4dde1d
am: 69a9ba87a1

Change-Id: Ib812553bbb9bdfbe37ea9ee526efb61b0a6b3784
2017-04-12 22:21:59 +00:00
Dan Willemsen
69a9ba87a1 Merge "Include what you use" am: 5a975c703f
am: 257a4dde1d

Change-Id: Iaaeddb83bf794db97eb2d64046773b2b938933a9
2017-04-12 22:16:59 +00:00
Dan Willemsen
257a4dde1d Merge "Include what you use"
am: 5a975c703f

Change-Id: Id47fd6a265eedb3b7b07e5311b08a5c184924bb9
2017-04-12 22:11:32 +00:00
Treehugger Robot
5a975c703f Merge "Include what you use" 2017-04-12 22:00:02 +00:00
Dan Willemsen
24230cd423 Include what you use
This doesn't need utils/Log.h, only log/log.h (and liblog)

Bug: 33241851
Test: m -j libpower
Merged-In: I21b08203fad51902d4a0f6172b4321b8b701ec47
Change-Id: I21b08203fad51902d4a0f6172b4321b8b701ec47
2017-04-11 18:22:37 +00:00
Dan Willemsen
3a43ae7249 Include what you use
This doesn't need utils/Log.h, only log/log.h (and liblog)

Bug: 33241851
Test: m -j libpower
Change-Id: I21b08203fad51902d4a0f6172b4321b8b701ec47
2017-04-11 05:48:54 +00:00
Vijay Venkatraman
aaef62ea41 Exporting headers as libhardware_legacy_headers am: c99381fff4
am: dac3252d85

Change-Id: Ie9cc4f6462c2265f02750d02e97d55539476b632
2017-04-05 22:53:19 +00:00
Vijay Venkatraman
dac3252d85 Exporting headers as libhardware_legacy_headers
am: c99381fff4

Change-Id: I0e488f25d7d35b3a391bbe8e0ff3d0286fd53b96
2017-04-05 22:47:29 +00:00
Etan Cohen
7cc65eb1c8 Merge "[AWARE]: Make changes to support NAN Publish Replied Indication" am: fd58969128 am: ea840aa7a9 am: cd9df3c35b
am: 3c85d4d2e7

Change-Id: Iab6f6a020091fcecfc73f0e0d07fb4a881be001a
2017-04-05 22:35:10 +00:00
Etan Cohen
3c85d4d2e7 Merge "[AWARE]: Make changes to support NAN Publish Replied Indication" am: fd58969128 am: ea840aa7a9
am: cd9df3c35b

Change-Id: I309844e5b784f0fdc22d73fc96c76222fc576683
2017-04-05 22:22:38 +00:00
Etan Cohen
cd9df3c35b Merge "[AWARE]: Make changes to support NAN Publish Replied Indication" am: fd58969128
am: ea840aa7a9

Change-Id: Ib8dc333e09c7bf4f68be615de7e082ab271f4b77
2017-04-05 22:19:36 +00:00
Etan Cohen
ea840aa7a9 Merge "[AWARE]: Make changes to support NAN Publish Replied Indication"
am: fd58969128

Change-Id: Icd8f4c92103396156c06e8dcd5180cd11678631e
2017-04-05 22:17:06 +00:00
Etan Cohen
fd58969128 Merge "[AWARE]: Make changes to support NAN Publish Replied Indication" 2017-04-05 22:09:37 +00:00
Vijay Venkatraman
c99381fff4 Exporting headers as libhardware_legacy_headers
Bug: 33241851
Test: Build sailfish
Change-Id: I05dac45051713ac56b53b2d8fd8b01281dbe0db1
(cherry picked from commit a150372fcc)
2017-04-05 10:07:56 -07:00
Vijay Venkatraman
37a54f30b8 Merge "Exporting headers as libhardware_legacy_headers" am: 825a3e4895 am: d0573b07c1 am: a673b8d80d
am: b3ecdf3ed4

Change-Id: I565e8d18fc78fe2de77775f7f872ee665f902d2f
2017-04-05 01:16:22 +00:00
Vijay Venkatraman
b3ecdf3ed4 Merge "Exporting headers as libhardware_legacy_headers" am: 825a3e4895 am: d0573b07c1
am: a673b8d80d

Change-Id: I412d05500746de3bf9020722b106c8805f83adfc
2017-04-05 01:13:54 +00:00
Vijay Venkatraman
a673b8d80d Merge "Exporting headers as libhardware_legacy_headers" am: 825a3e4895
am: d0573b07c1

Change-Id: I74a52e504d309474567a89279bf946232d5defd9
2017-04-05 01:11:52 +00:00
Vijay Venkatraman
d0573b07c1 Merge "Exporting headers as libhardware_legacy_headers"
am: 825a3e4895

Change-Id: I5da4dddd3d040c794d32a7ec66307ddd3b08a7ae
2017-04-05 01:09:22 +00:00