diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-14 01:07:12 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-14 01:07:12 +0000 |
| commit | dd9ec1340e4d6cc085e7d0c54c59790abd576484 (patch) | |
| tree | 129e7761884b529908589e46005ef942ba0f5239 | |
| parent | 7793e6c6f3f6926a9a6f412aee7149a622ec0d83 (diff) | |
| parent | e44c0b35f33c9ac482f2efba87791e7d9c8b8211 (diff) | |
| download | display-dd9ec1340e4d6cc085e7d0c54c59790abd576484.tar.gz | |
Snap for 7280565 from e44c0b35f33c9ac482f2efba87791e7d9c8b8211 to sc-d1-release
Change-Id: I27fe54ba048401f493ba5ba4069810af31204a80
| -rw-r--r-- | gralloc/Android.bp | 34 | ||||
| -rw-r--r-- | gralloc/Android.mk | 19 |
2 files changed, 34 insertions, 19 deletions
diff --git a/gralloc/Android.bp b/gralloc/Android.bp new file mode 100644 index 00000000..d6256abf --- /dev/null +++ b/gralloc/Android.bp @@ -0,0 +1,34 @@ +package { + default_applicable_licenses: ["hardware_qcom_sm8150_display_license"], +} + +cc_library_shared { + name: "libgrallocutils", + vendor: true, + defaults: ["display_go_defaults"], + srcs: [ + "gr_utils.cpp", + "gr_adreno_info.cpp", + ], + cflags: [ + "-DLOG_TAG=\"qdgralloc\"", + "-Wno-sign-conversion", + ], + shared_libs: [ + "android.hardware.graphics.mapper@2.0", + "android.hardware.graphics.mapper@2.1", + "android.hardware.graphics.mapper@3.0", + "libcutils", + "libdl", + "liblog", + "//vendor/qcom/sm8150:libqdMetaData", + ], + header_libs: [ + "display_headers", + "device_kernel_headers", + ], + export_header_lib_headers: [ + "device_kernel_headers", + ], + export_include_dirs: ["."], +}
\ No newline at end of file diff --git a/gralloc/Android.mk b/gralloc/Android.mk index 0a55f644..b6433e5b 100644 --- a/gralloc/Android.mk +++ b/gralloc/Android.mk @@ -27,25 +27,6 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) LOCAL_SRC_FILES := gr_device_impl.cpp include $(BUILD_SHARED_LIBRARY) -#libgrallocutils -include $(CLEAR_VARS) -LOCAL_MODULE := libgrallocutils -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD legacy_not_a_contribution -LOCAL_LICENSE_CONDITIONS := by_exception_only not_allowed notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../LICENSE -LOCAL_VENDOR_MODULE := true -LOCAL_MODULE_TAGS := optional -LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) -LOCAL_HEADER_LIBRARIES := display_headers -LOCAL_SHARED_LIBRARIES := $(common_libs) libqdMetaData libdl \ - android.hardware.graphics.mapper@2.0 \ - android.hardware.graphics.mapper@2.1 \ - android.hardware.graphics.mapper@3.0 -LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdgralloc\" -Wno-sign-conversion -LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) -LOCAL_SRC_FILES := gr_utils.cpp gr_adreno_info.cpp -include $(BUILD_SHARED_LIBRARY) - #libgralloccore include $(CLEAR_VARS) LOCAL_MODULE := libgralloccore |