diff options
| author | Yiwei Zhang <zzyiwei@google.com> | 2018-04-05 13:38:00 -0700 |
|---|---|---|
| committer | Yiwei Zhang <zzyiwei@google.com> | 2018-04-05 13:38:00 -0700 |
| commit | 42393395be4cf94d0a0030fb22f9ec38fabf842e (patch) | |
| tree | f49932ec579078cedba24b9f1c26003c6d9a4469 | |
| parent | 990c4d510781b97981036e26f6d7b8d10c152e29 (diff) | |
| download | vulkan-validation-layers-pie-qpr1-s2-release.tar.gz | |
Decouple vkjson from cjson in external/LVLandroid-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-dev
LVL upstream move cjson into part of LVL loader. Thus need to decouple
vkjson from cjson in advance.
Test: adb shell cmd gpu vkjson
Bug: b/77613206
Change-Id: I87e01723953b124a3558dad2faba0e15898eddde
| -rw-r--r-- | Android.bp | 3 | ||||
| -rw-r--r-- | libs/cjson/Android.bp | 36 |
2 files changed, 0 insertions, 39 deletions
diff --git a/Android.bp b/Android.bp deleted file mode 100644 index c1f0207b7..000000000 --- a/Android.bp +++ /dev/null @@ -1,3 +0,0 @@ -subdirs = [ - "libs/cjson", -] diff --git a/libs/cjson/Android.bp b/libs/cjson/Android.bp deleted file mode 100644 index 6a1600cd8..000000000 --- a/libs/cjson/Android.bp +++ /dev/null @@ -1,36 +0,0 @@ -cc_library_static { - name: "cjson", - clang: true, - srcs: [ - "cJSON.c", - ], - cflags: [ - "-Wall", - "-Werror", - ], - local_include_dirs: [ - "includes", - ], - export_include_dirs: [ - "includes", - ], -} - -cc_library_static { - name: "cjson_ndk", - clang: true, - srcs: [ - "cJSON.c", - ], - cflags: [ - "-Wall", - "-Werror", - ], - local_include_dirs: [ - "includes", - ], - export_include_dirs: [ - "includes", - ], - sdk_version: "24", -} |