diff options
| author | 2016-12-28 16:58:07 +0000 | |
|---|---|---|
| committer | 2016-12-28 16:58:07 +0000 | |
| commit | 7e92307cd8d5c22daeeae7cb6ab5943be0226e7a (patch) | |
| tree | d733d77cbafe352fd20935eab60435a365beb8af /libs/gui | |
| parent | e6d3ac98341ce53109e97c2ab1761017f50bde4a (diff) | |
| parent | 1efda0b1d68682116cca9e7e6ab513ae59d60d8b (diff) | |
Merge "Replace cutils/log.h and rationalize log/log.h and android/log.h"
am: 1efda0b1d6
Change-Id: I263fa3a582bbff546f1281205b539258ee5dab49
Diffstat (limited to 'libs/gui')
| -rw-r--r-- | libs/gui/GraphicBufferAlloc.cpp | 2 | ||||
| -rw-r--r-- | libs/gui/Sensor.cpp | 11 |
2 files changed, 6 insertions, 7 deletions
diff --git a/libs/gui/GraphicBufferAlloc.cpp b/libs/gui/GraphicBufferAlloc.cpp index e6150f4926..3b37e5b58d 100644 --- a/libs/gui/GraphicBufferAlloc.cpp +++ b/libs/gui/GraphicBufferAlloc.cpp @@ -15,7 +15,7 @@ ** limitations under the License. */ -#include <cutils/log.h> +#include <android/log.h> #include <ui/GraphicBuffer.h> diff --git a/libs/gui/Sensor.cpp b/libs/gui/Sensor.cpp index 053d153296..dbf03a5232 100644 --- a/libs/gui/Sensor.cpp +++ b/libs/gui/Sensor.cpp @@ -14,21 +14,20 @@ * limitations under the License. */ +#include <inttypes.h> +#include <stdint.h> +#include <sys/limits.h> +#include <sys/types.h> +#include <android/log.h> #include <binder/AppOpsManager.h> #include <binder/IServiceManager.h> #include <gui/Sensor.h> #include <hardware/sensors.h> -#include <log/log.h> #include <utils/Errors.h> #include <utils/String8.h> #include <utils/Flattenable.h> -#include <inttypes.h> -#include <stdint.h> -#include <sys/types.h> -#include <sys/limits.h> - // ---------------------------------------------------------------------------- namespace android { // ---------------------------------------------------------------------------- |