Commit Graph

6 Commits

Author SHA1 Message Date
Yifan Hong 3ca68183bb LOCAL_PROPRIETARY_MODULE implies LOCAL_USE_VNDK
Test: m -j -k BOARD_VNDK_VERSION=true

Bug: 37342627

Change-Id: I6bb878eeb2a7b2cb4392fd60bc397e35ad51a6e2
Merged-In: I6bb878eeb2a7b2cb4392fd60bc397e35ad51a6e2
2017-06-20 15:42:37 -07:00
Dan Willemsen 05a2b931e9 Add LOCAL_VENDOR_MODULE as a synonym to LOCAL_PROPRIETARY_MODULE
The vendor image will have more than just proprietary modules in it
under Treble, so let's stop marking open source code as proprietary just
to move it to vendor.

Bug: 36452052
Test: compare build-aosp_arm.ninja before/after, no changes.
Test: Try defining LOCAL_VENDOR_MODULE / LOCAL_PROPRIETARY_MODULE in the
same and different ways, ensure it works.
Change-Id: I0ab046bcb7563a20d44ed00667e18497ef0873a8
2017-03-20 20:57:04 -07:00
Vijay Venkatraman 43a7f0c765 Revert "Revert "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set.""
This reverts commit 823172e209.

Test: build.ninja for any target doesnt change, unless
BOARD_VNDK_VERSION is turned on in BoardConfig.mk
Change-Id: I4e1baaf5a2251de20f71a47096ce53e23d7e2d80
2016-12-22 05:53:39 +00:00
Vijay Venkatraman 823172e209 Revert "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set."
This reverts commit 2b6c204c73.

Change-Id: I60a042f2ed0c767ec3a45c31ee1b99d43891efaa
2016-12-16 02:08:18 +00:00
Vijay Venkatraman 2b6c204c73 Extends VNDK support in Make by setting LOCAL_USE_VNDK
for modules going into vendor partition, except when
they already have LOCAL_SDK_VERSION set.

Test: Any module that uses VNDK
Change-Id: Ic90b165ade8d9845595f371f410635cae6477d7c
2016-12-05 18:19:44 -08:00
Dan Willemsen bab0fa6928 Add basic VNDK support in Make
Add BOARD_VNDK_VERSION and LOCAL_USE_VNDK to specify the version of the
VNDK that will be used globally, and whether to use the VNDK on a module
basis.

If the board is using the VNDK:

* LOCAL_COPY_HEADERS may only be used by modules defining LOCAL_USE_VNDK
* LOCAL_USE_VNDK modules will compile against the NDK headers and stub
  libraries, but continue to use the platform libc++.
* LOCAL_USE_VNDK modules will not have the global includes like
  system/core/include, but it will use device-specific kernel headers.

This change does not attempt to enforce any linking constraints, that
will come in a later patch.

Test: out/build-aosp_arm.ninja is identical before/after
Change-Id: Icce65d4974f085093d500b5b2516983788fe2905
2016-11-28 13:46:17 -08:00