summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-05-15Snap for 6497471 from f0ff5a6b4659491e915abe941c7a194f06b09bec to ↵r_aml_301500702android-mainline-12.0.0_r55android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r4android-mainline-11.0.0_r33android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r10android-mainline-11.0.0_r1android11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid-build-team Robot
mainline-release Change-Id: I16b86308adb45b3c759e87ad817b22b1aef0f495
2020-05-14Targeted minimal fix for security issue in CVE-2020-9589. am: 8051967ac1 am: ↵android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseZ Stern
17f4b85725 am: ab47f56729 am: 0d886a49d3 am: ecb2edbc9a am: dd40fd0c8c am: 234929445c Change-Id: Iab8faaae567e2d61dd8ab9e31c7898a95704471c
2020-05-14Targeted minimal fix for security issue in CVE-2020-9589. am: 8051967ac1 am: ↵android11-devZ Stern
17f4b85725 am: ab47f56729 am: 0d886a49d3 am: ecb2edbc9a am: dd40fd0c8c Change-Id: I062a9583a87a0b7272bfdb83057a5c96d1fe6061
2020-05-14Targeted minimal fix for security issue in CVE-2020-9589. am: 8051967ac1 am: ↵Z Stern
17f4b85725 am: ab47f56729 am: 0d886a49d3 am: ecb2edbc9a Change-Id: I52606e67b83bf61230aaf8089e220a7a4c0653c3
2020-05-14Targeted minimal fix for security issue in CVE-2020-9589. am: 8051967ac1 am: ↵Z Stern
17f4b85725 am: ab47f56729 am: 0d886a49d3 Change-Id: I7e85179f18cc445b1cbcebbec62fa3149817a643
2020-05-14Targeted minimal fix for security issue in CVE-2020-9589. am: 8051967ac1 am: ↵Z Stern
17f4b85725 am: ab47f56729 Change-Id: I2f7e5cb3225a4f6f475ab2217c04c95e4079b70e
2020-05-14Targeted minimal fix for security issue in CVE-2020-9589. am: 8051967ac1 am: ↵Z Stern
17f4b85725 Change-Id: I802d25a18c01dd363636e88157fa223143e70dd6
2020-05-14Targeted minimal fix for security issue in CVE-2020-9589. am: 8051967ac1Z Stern
Change-Id: Ifa5bebb1e0a14dfed16958a0710a7232db9755ff
2020-05-13Targeted minimal fix for security issue in CVE-2020-9589.Z Stern
Bug: 156261521 Test: If0722deb96def186fcd0a2d97e57647a1b5987f8 Change-Id: I380c158e465a995a5b0f88021cbf10bbf050db00 Merged-In: I380c158e465a995a5b0f88021cbf10bbf050db00
2019-03-12Revert "Mark libdng_sdk as double_loadable" am: e4548282e9 am: c8d0c9b1d1android-r-preview-1android-mainline-10.0.0_r9android-mainline-10.0.0_r8android-mainline-10.0.0_r7android-mainline-10.0.0_r6android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r11android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r43android-10.0.0_r42android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12ndk-sysroot-r21android10-qpr3-s1-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-resolv-releaseandroid10-mainline-networking-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseJooyung Han
am: 23c1b8f9ac Change-Id: Icbfe5b40e5b75ce44d468a8f5ad2312875a53fb9
2019-03-12Revert "Mark libdng_sdk as double_loadable" am: e4548282e9Jooyung Han
am: c8d0c9b1d1 Change-Id: I4118ca89a1a4157597040989346abcb3a3eb96be
2019-03-12Revert "Mark libdng_sdk as double_loadable"android-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Jooyung Han
am: e4548282e9 Change-Id: I90e79fe9a3635d62d5c09813ef5f2cea771513fc
2019-03-12Revert "Mark libdng_sdk as double_loadable"android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseJooyung Han
This reverts commit 79287a8b67b6bc3ba3ec64dc2e87a10700fa319c. Reason for revert: libdng_sdk is no longer used by libmediandk(aosp/918473). Exempt-From-Owner-Approval: revert Change-Id: I27fe936681c73c54211515e00636488db4491f23
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
am: a0f3545b8b Change-Id: Ibbc4c064b48a3df1f6c2fb34536b379595c0d012
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: I01c2fa1f56c9c45ac53b83ec92e505663cacd972
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: I6e0d221bf558675cb9886c6abea85c8ddf249ec7
2019-02-10Mark libdng_sdk as double_loadable am: 79287a8b67 am: c1cb5de601Jooyung Han
am: 0f6fc17cde Change-Id: I180170ed16b9884fe75fd5fef2aaa3ca9f00a3ac
2019-02-10Mark libdng_sdk as double_loadable am: 79287a8b67Jooyung Han
am: c1cb5de601 Change-Id: I1434b61ee4a90dc83a1ab16e5ab83f3ef1f1d4e7
2019-02-10Mark libdng_sdk as double_loadableJooyung Han
am: 79287a8b67 Change-Id: I9f48227888c16fd8c808f2a21493539eb2bbfcda
2019-02-07Mark libdng_sdk as double_loadableJooyung Han
libdng_sdk is a vendor_available lib and also used by LLNDK(libmediandk) which means this lib can be double-loaded. (deps: libmediandk -> libmedia_jni -> libandroid_runtime -> libhwui -> libdng_sdk) Bug: 121280180 Test: m -j Change-Id: I78a52e7cd4c00f22a5db9700ff6112a821d4b226
2019-01-17Fix occurrences of Wextra-semi-stmt am: c3dd9e5e06 am: a1d97c6536Pirama Arumuga Nainar
am: ccb70374b5 Change-Id: Id87415670fe084f32e1c5decd7ac2af00828cd98
2019-01-17Fix occurrences of Wextra-semi-stmt am: c3dd9e5e06Pirama Arumuga Nainar
am: a1d97c6536 Change-Id: I07696770963cbba75b545d591231c990429bd7e3
2019-01-17Fix occurrences of Wextra-semi-stmtPirama Arumuga Nainar
am: c3dd9e5e06 Change-Id: Idc6a28cf95243295aa6489ca6a8707022e5cbca1
2019-01-17Fix occurrences of Wextra-semi-stmtPirama Arumuga Nainar
Bug: http://b/123023349 Upcoming clang update adds a new diagnostic about empty statements from extraneous semicolons. Remove the semicolon at the end of DNG_ASSERT since most uses of the macro treat it as a function call and add a semicolon after the macro statement. Fix the one use of DNG_ASSERT that wasn't using a macro. Test: Build with new clang. Change-Id: I7c53fe4d19441446e2c5b7871b4bf07dfffd154c
2018-12-11Enable libdng_sdk for Windows am: 33c601f0f3 am: e152f6b89dJerome Gaillard
am: bbed370da7 Change-Id: I8ea0c7120200f05964734cadb6b0e30ff1ad0e3e
2018-12-11Enable libdng_sdk for Windows am: 33c601f0f3Jerome Gaillard
am: e152f6b89d Change-Id: I7d0b0a5c72494ed045087204f003e05bf78300dd
2018-12-11Enable libdng_sdk for WindowsJerome Gaillard
am: 33c601f0f3 Change-Id: I85f317e0e2a81b1ac1147624dcb6d5aadfb3268b
2018-12-10Enable libdng_sdk for Windowsandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7Jerome Gaillard
This is needed to use skia in Android Studio for Windows. Changes include: - Replacing in dng_pthread.cpp '&operator(...) { }' with '&operator(...);' to prevent 'control reaches end of non-void function' errors - Removing test of '_MSC_VER >= 1900' in dng_pthread.h as we use clang for compilation which has a recent version of 'time.h' but fails the test '_MSC_VER >= 1900' Test: sdk build Change-Id: I200d691378c5d3e7c1729b5f645766755aa3e296
2018-12-10[automerger skipped] DO NOT MERGE am: 1eb122c45f -s ours am: 85ba089a5c -s ↵Xin Li
ours am: 5c458ab03a -s ours Change-Id: I9462b77af3230453287b159285c174c1e88247eb
2018-12-10[automerger skipped] DO NOT MERGE am: 1eb122c45f -s oursXin Li
am: 85ba089a5c -s ours Change-Id: I963ae3d7a8b4e65ed88cbbcccbd8cecfdd466071
2018-12-10[automerger skipped] DO NOT MERGEXin Li
am: 1eb122c45f -s ours Change-Id: I6ea4b3848f3d840cab7ed0a80cf8912149861e25
2018-12-07DO NOT MERGEXin Li
Merge pie-platform-release (PPRL.181205.001, history only) into master Bug: 120502534 Change-Id: Id2708adf8c4e6c15060eeb5462e0d8bed998e54d
2018-11-20Enable libdng_sdk for macOs am: d875b81f79 am: a2b40c70c7Jerome Gaillard
am: 6878a13442 Change-Id: I54b6cb29aca379c7769fd62f1f93268dc65cb36f
2018-11-20Enable libdng_sdk for macOs am: d875b81f79Jerome Gaillard
am: a2b40c70c7 Change-Id: Ibe61f65f8585fdf8420e7d721da0042d40eafeeb
2018-11-20Enable libdng_sdk for macOsJerome Gaillard
am: d875b81f79 Change-Id: I0bfd8f6eb8bc6ff65fc032ca01a0eea2520e5608
2018-11-06Enable libdng_sdk for macOsandroid-wear-8.0.0_r2android-n-iot-release-ihome-igv1nougat-iot-releaseJerome Gaillard
Following the fix for libjpeg (commit d2a27d5), this enables the host build of libdng_sdk for macOs. This requires a change in dng_utils.cpp to remove usage of a deprecated API on macOs. Test: macOs sdk build Change-Id: Ife2123949d57291435badb0410ef0c3269bd2db8
2018-10-29Create a host target for libdng_sdk am: eef3c2700e am: a58d85b32dJerome Gaillard
am: 8fc7e4f83f Change-Id: I0cad483d396bc9d532f4d21163a41ab0888ae9f3
2018-10-29Create a host target for libdng_sdk am: eef3c2700eJerome Gaillard
am: a58d85b32d Change-Id: I81fbb47dbeda15086e0d6f474984c23fdf10ad5c
2018-10-29Create a host target for libdng_sdkJerome Gaillard
am: eef3c2700e Change-Id: If073cccff2bd937074ee0d3cee8a34d9522b7d0d
2018-10-23Create a host target for libdng_sdkandroid-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsJerome Gaillard
This is required for building a version of layoutlib using skia as its renderer. This is disabled on macOs because libjpeg is not available on that platform. Test: sdk build Change-Id: Ib81956df0171da2ac8be70683f8a9b9725ffe49d
2018-08-08Merge Android Pie into master am: 3bfa7e203f am: 23d2bbdf89 am: 7f657a970aXin Li
am: b06dd6f2c9 Change-Id: Idc5f7c8104c0d68bb896a9cb2eb9eca4bfd7ba33
2018-08-07Merge Android Pie into master am: 3bfa7e203f am: 23d2bbdf89Xin Li
am: 7f657a970a Change-Id: If12b21265b77263de252e4ba7dfb2538c32a63ea
2018-08-07Merge Android Pie into master am: 3bfa7e203fXin Li
am: 23d2bbdf89 Change-Id: Idb7af30c4c349b5a85b3a4612e336bdebaa4e4ad
2018-08-07Merge Android Pie into masterXin Li
am: 3bfa7e203f Change-Id: I1fffe70b278e9bee224615085b11c3bfb5acb5f6
2018-08-06Merge Android Pie into masterandroid-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseXin Li
Bug: 112104996 Change-Id: I2d009e7c4f1ee466a475faf36d6a09b06399cd0c
2018-06-09Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: e8cf540c35Xin Li
am: fc7defe368 Change-Id: I1959caa22698f53d0f7cfb03b5498e9b70cba611
2018-06-09Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li
am: e8cf540c35 Change-Id: Ic86076d1b432b160e455204acc018c12664bf044
2018-06-08Merge pi-dev-plus-aosp-without-vendor into stage-aosp-mastertemp_p_mergeXin Li
Bug: 79597307 Change-Id: I4bf828a2cf87e4c4273e724b575fa08b5dab02af
2018-04-18Snap for 4728508 from f76714893c654b874433e635d6b799f7c50c5b0c to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r6android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-releaseandroid-build-team Robot
Change-Id: Ie11828de97196438ba42074e2bfa133ed1a241ee
2018-04-17Merge "Add build rule for dng_validate_host" into pi-dev am: f76714893cEino-Ville Talvala
am: bf79b812da Change-Id: I67b9555c8bc8f60d9cd63b414bf353ac5296d1c6
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 02:08:50 +0000