Extract Android 9 headers

Makefile

@@ -10,13 +10,15 @@ install:
 	cp android-config.h android-version.h $(DESTDIR)/$(INCLUDEDIR)
 	cp android-headers.pc $(DESTDIR)/$(PKGCONFIGDIR)
 	sed -i -e s:prefix=/usr:prefix=$(PREFIX):g $(DESTDIR)/$(PKGCONFIGDIR)/android-headers.pc
+	cp -r android $(DESTDIR)/$(INCLUDEDIR)
+	cp -r cutils $(DESTDIR)/$(INCLUDEDIR)
 	cp -r hardware $(DESTDIR)/$(INCLUDEDIR)
 	cp -r hardware_legacy $(DESTDIR)/$(INCLUDEDIR)
-	cp -r cutils $(DESTDIR)/$(INCLUDEDIR)
-	cp -r system $(DESTDIR)/$(INCLUDEDIR)
-	cp -r android $(DESTDIR)/$(INCLUDEDIR)
 	cp -r linux $(DESTDIR)/$(INCLUDEDIR)
-	cp -r sync $(DESTDIR)/$(INCLUDEDIR)
-	cp -r libnfc-nxp $(DESTDIR)/$(INCLUDEDIR)
-	cp -r private $(DESTDIR)/$(INCLUDEDIR)
 	cp -r log $(DESTDIR)/$(INCLUDEDIR)
+	cp -r nativebase $(DESTDIR)/$(INCLUDEDIR)
+	cp -r ndk $(DESTDIR)/$(INCLUDEDIR)
+	cp -r private $(DESTDIR)/$(INCLUDEDIR)
+	cp -r sync $(DESTDIR)/$(INCLUDEDIR)
+	cp -r system $(DESTDIR)/$(INCLUDEDIR)
+	cp -r vndk $(DESTDIR)/$(INCLUDEDIR)

android-config.h

@@ -4,7 +4,7 @@
 /* When android is built for a specific device the build is
    modified by BoardConfig.mk and possibly other mechanisms.
    eg
-   device/samsung/i9305/BoardConfig.mk: 
+   device/samsung/i9305/BoardConfig.mk:
        COMMON_GLOBAL_CFLAGS += -DCAMERA_WITH_CITYID_PARAM
    device/samsung/smdk4412-common/BoardCommonConfig.mk:
        COMMON_GLOBAL_CFLAGS += -DEXYNOS4_ENHANCEMENTS
@@ -15,12 +15,10 @@
 
    Typically it is generated at hardware adaptation time.
 
-   The CONFIG GOES HERE line can be used by automation to modify
+   The CONFIG GOES... line below can be used by automation to modify
    this file.
 */
 
 #include <android-version.h>
 
-/* CONFIG GOES HERE */
-
 #endif

android-headers.pc

@@ -1,6 +1,6 @@
 Name: Android header files
 Description: Header files needed to write applications for the Android platform
-Version: 7.1.1
+Version: 9.0.0
 
 prefix=/usr
 exec_prefix=${prefix}

android-version.h

@@ -1,9 +1,9 @@
 #ifndef ANDROID_VERSION_H_
 #define ANDROID_VERSION_H_
 
-#define ANDROID_VERSION_MAJOR 7
-#define ANDROID_VERSION_MINOR 1
-#define ANDROID_VERSION_PATCH 1
+#define ANDROID_VERSION_MAJOR 9
+#define ANDROID_VERSION_MINOR 0
+#define ANDROID_VERSION_PATCH 0
 #define ANDROID_VERSION_PATCH2 0
 #define ANDROID_VERSION_PATCH3 0
 

android/api-level.h

@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef ANDROID_API_LEVEL_H
+#define ANDROID_API_LEVEL_H
+
+#include <sys/cdefs.h>
+
+/*
+ * Magic version number for a current development build, which has
+ * not yet turned into an official release.
+ */
+#ifndef __ANDROID_API_FUTURE__
+#define __ANDROID_API_FUTURE__ 10000
+#endif
+
+#ifndef __ANDROID_API__
+#define __ANDROID_API__ __ANDROID_API_FUTURE__
+#else
+#define __ANDROID_NDK__ 1
+#endif
+
+#define __ANDROID_API_G__ 9
+#define __ANDROID_API_I__ 14
+#define __ANDROID_API_J__ 16
+#define __ANDROID_API_J_MR1__ 17
+#define __ANDROID_API_J_MR2__ 18
+#define __ANDROID_API_K__ 19
+#define __ANDROID_API_L__ 21
+#define __ANDROID_API_L_MR1__ 22
+#define __ANDROID_API_M__ 23
+#define __ANDROID_API_N__ 24
+#define __ANDROID_API_N_MR1__ 25
+#define __ANDROID_API_O__ 26
+#define __ANDROID_API_O_MR1__ 27
+#define __ANDROID_API_P__ 28
+
+#endif

android/data_space.h

@@ -0,0 +1,108 @@
+/*
+ * Copyright 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @file data_space.h
+ */
+
+#ifndef ANDROID_DATA_SPACE_H
+#define ANDROID_DATA_SPACE_H
+
+#include <inttypes.h>
+
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+
+/**
+ * ADataSpace.
+ */
+enum ADataSpace {
+    /**
+     * Default-assumption data space, when not explicitly specified.
+     *
+     * It is safest to assume the buffer is an image with sRGB primaries and
+     * encoding ranges, but the consumer and/or the producer of the data may
+     * simply be using defaults. No automatic gamma transform should be
+     * expected, except for a possible display gamma transform when drawn to a
+     * screen.
+     */
+    ADATASPACE_UNKNOWN = 0,
+
+    /**
+     * scRGB linear encoding:
+     *
+     * The red, green, and blue components are stored in extended sRGB space,
+     * but are linear, not gamma-encoded.
+     * The RGB primaries and the white point are the same as BT.709.
+     *
+     * The values are floating point.
+     * A pixel value of 1.0, 1.0, 1.0 corresponds to sRGB white (D65) at 80 nits.
+     * Values beyond the range [0.0 - 1.0] would correspond to other colors
+     * spaces and/or HDR content.
+     */
+    ADATASPACE_SCRGB_LINEAR = 406913024, // STANDARD_BT709 | TRANSFER_LINEAR | RANGE_EXTENDED
+
+    /**
+     * sRGB gamma encoding:
+     *
+     * The red, green and blue components are stored in sRGB space, and
+     * converted to linear space when read, using the SRGB transfer function
+     * for each of the R, G and B components. When written, the inverse
+     * transformation is performed.
+     *
+     * The alpha component, if present, is always stored in linear space and
+     * is left unmodified when read or written.
+     *
+     * Use full range and BT.709 standard.
+     */
+    ADATASPACE_SRGB = 142671872, // STANDARD_BT709 | TRANSFER_SRGB | RANGE_FULL
+
+    /**
+     * scRGB:
+     *
+     * The red, green, and blue components are stored in extended sRGB space,
+     * but are linear, not gamma-encoded.
+     * The RGB primaries and the white point are the same as BT.709.
+     *
+     * The values are floating point.
+     * A pixel value of 1.0, 1.0, 1.0 corresponds to sRGB white (D65) at 80 nits.
+     * Values beyond the range [0.0 - 1.0] would correspond to other colors
+     * spaces and/or HDR content.
+     */
+    ADATASPACE_SCRGB = 411107328, // STANDARD_BT709 | TRANSFER_SRGB | RANGE_EXTENDED
+
+    /**
+     * Display P3
+     *
+     * Use same primaries and white-point as DCI-P3
+     * but sRGB transfer function.
+     */
+    ADATASPACE_DISPLAY_P3 = 143261696, // STANDARD_DCI_P3 | TRANSFER_SRGB | RANGE_FULL
+
+    /**
+     * ITU-R Recommendation 2020 (BT.2020)
+     *
+     * Ultra High-definition television
+     *
+     * Use full range, SMPTE 2084 (PQ) transfer and BT2020 standard
+     */
+    ADATASPACE_BT2020_PQ = 163971072, // STANDARD_BT2020 | TRANSFER_ST2084 | RANGE_FULL
+};
+
+__END_DECLS
+
+#endif // ANDROID_DATA_SPACE_H