diff options
| author | Justin Yun <justinyun@google.com> | 2017-09-29 05:32:21 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-29 05:32:21 +0000 |
| commit | 7669a8f9e7b85770277cc0b8e6f5ebd062870838 (patch) | |
| tree | dd48082e32bfc63cb755204830d43628677a193b | |
| parent | 5b94d06cbed0e2204c28fe8f01ee6abe860f146f (diff) | |
| parent | 7135a3ca37970551a85d477650e43717b1094987 (diff) | |
| download | common-7669a8f9e7b85770277cc0b8e6f5ebd062870838.tar.gz | |
resolve merge conflicts of 3bc992f to oc-mr1-dev-plus-aosp
am: 7135a3ca37
Change-Id: Idcf30bf0f89d76306507aeade277f90c655c0b00
| -rw-r--r-- | vndk/vndk-sp-libs.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vndk/vndk-sp-libs.mk b/vndk/vndk-sp-libs.mk index 57a9586..08f9aca 100644 --- a/vndk/vndk-sp-libs.mk +++ b/vndk/vndk-sp-libs.mk @@ -1,5 +1,5 @@ ifndef BOARD_VNDK_VERSION -VNDK_SP_LIBRARIES += \ +VNDK_SP_LIBRARIES := \ android.hardware.graphics.allocator@2.0 \ android.hardware.graphics.mapper@2.0 \ android.hardware.graphics.common@1.0 \ |