Headers 9.0 retry

Makefile

@@ -1,24 +1,12 @@
 PREFIX?=/usr/local
 INCLUDEDIR?=$(PREFIX)/include/android
-PKGCONFIGDIR?=$(PREFIX)/lib/pkgconfig
 all:
 	@echo "Use '$(MAKE) install' to install"
 
 install:
 	mkdir -p $(DESTDIR)/$(INCLUDEDIR)
-	mkdir -p $(DESTDIR)/$(PKGCONFIGDIR)
-	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 linux $(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)
+	cp -r * $(DESTDIR)/$(INCLUDEDIR)
+	rm -f $(DESTDIR)/$(INCLUDEDIR)/Makefile
+	rm -f $(DESTDIR)/$(INCLUDEDIR)/android-headers.pc.in
+	mkdir -p $(DESTDIR)/$(PREFIX)/lib/pkgconfig
+	sed -e 's;@prefix@;$(PREFIX)/;g; s;@includedir@;$(INCLUDEDIR);g' android-headers.pc.in > $(DESTDIR)/$(PREFIX)/lib/pkgconfig/android-headers.pc

android-config.h

@@ -21,4 +21,6 @@
 
 #include <android-version.h>
 
+/* CONFIG GOES HERE */
+
 #endif

android-headers.pc.in

@@ -0,0 +1,4 @@
+Name: android-headers
+Description: Provides the headers for the droid system
+Version: 9.0.0
+Cflags: -I@includedir@

git-revisions.txt

@@ -0,0 +1,147 @@
+================================================
+bionic @ Tue Apr 20 22:05:28 CEST 2021
+================================================
++ cd 9.0
++ repo status bionic
+
+... A new version of repo (2.12) is available.
+... You should upgrade soon:
+    cp /media/herrie/HaliumDisk/9.0/.repo/repo/repo /home/herrie/bin/repo
+
+nothing to commit (working directory clean)
++ cd 9.0/bionic
+./extract-headersnew.sh: 329: cd: can't cd to 9.0/bionic
++ git show-ref --head
+fatal: not a git repository (or any parent up to mount point /media/herrie)
+Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
++ git remote -v
+fatal: not a git repository (or any parent up to mount point /media/herrie)
+Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
+
+
+================================================
+hardware/libhardware @ Tue Apr 20 22:05:28 CEST 2021
+================================================
++ cd 9.0
++ repo status hardware/libhardware
+
+... A new version of repo (2.12) is available.
+... You should upgrade soon:
+    cp /media/herrie/HaliumDisk/9.0/.repo/repo/repo /home/herrie/bin/repo
+
+nothing to commit (working directory clean)
++ cd 9.0/hardware/libhardware
+./extract-headersnew.sh: 329: cd: can't cd to 9.0/hardware/libhardware
++ git show-ref --head
+fatal: not a git repository (or any parent up to mount point /media/herrie)
+Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
++ git remote -v
+fatal: not a git repository (or any parent up to mount point /media/herrie)
+Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
+
+
+================================================
+hardware/libhardware_legacy @ Tue Apr 20 22:05:28 CEST 2021
+================================================
++ cd 9.0
++ repo status hardware/libhardware_legacy
+
+... A new version of repo (2.12) is available.
+... You should upgrade soon:
+    cp /media/herrie/HaliumDisk/9.0/.repo/repo/repo /home/herrie/bin/repo
+
+nothing to commit (working directory clean)
++ cd 9.0/hardware/libhardware_legacy
+./extract-headersnew.sh: 329: cd: can't cd to 9.0/hardware/libhardware_legacy
++ git show-ref --head
+fatal: not a git repository (or any parent up to mount point /media/herrie)
+Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
++ git remote -v
+fatal: not a git repository (or any parent up to mount point /media/herrie)
+Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
+
+
+================================================
+system/core @ Tue Apr 20 22:05:28 CEST 2021
+================================================
++ cd 9.0
++ repo status system/core
+
+... A new version of repo (2.12) is available.
+... You should upgrade soon:
+    cp /media/herrie/HaliumDisk/9.0/.repo/repo/repo /home/herrie/bin/repo
+
+nothing to commit (working directory clean)
++ cd 9.0/system/core
+./extract-headersnew.sh: 329: cd: can't cd to 9.0/system/core
++ git show-ref --head
+fatal: not a git repository (or any parent up to mount point /media/herrie)
+Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
++ git remote -v
+fatal: not a git repository (or any parent up to mount point /media/herrie)
+Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
+
+
+================================================
+system/media @ Tue Apr 20 22:05:28 CEST 2021
+================================================
++ cd 9.0
++ repo status system/media
+
+... A new version of repo (2.12) is available.
+... You should upgrade soon:
+    cp /media/herrie/HaliumDisk/9.0/.repo/repo/repo /home/herrie/bin/repo
+
+nothing to commit (working directory clean)
++ cd 9.0/system/media
+./extract-headersnew.sh: 329: cd: can't cd to 9.0/system/media
++ git show-ref --head
+fatal: not a git repository (or any parent up to mount point /media/herrie)
+Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
++ git remote -v
+fatal: not a git repository (or any parent up to mount point /media/herrie)
+Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
+
+
+================================================
+external/kernel-headers @ Tue Apr 20 22:05:28 CEST 2021
+================================================
++ cd 9.0
++ repo status external/kernel-headers
+
+... A new version of repo (2.12) is available.
+... You should upgrade soon:
+    cp /media/herrie/HaliumDisk/9.0/.repo/repo/repo /home/herrie/bin/repo
+
+nothing to commit (working directory clean)
++ cd 9.0/external/kernel-headers
+./extract-headersnew.sh: 329: cd: can't cd to 9.0/external/kernel-headers
++ git show-ref --head
+fatal: not a git repository (or any parent up to mount point /media/herrie)
+Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
++ git remote -v
+fatal: not a git repository (or any parent up to mount point /media/herrie)
+Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
+
+
+================================================
+external/libnfc-nxp @ Tue Apr 20 22:05:28 CEST 2021
+================================================
++ cd 9.0
++ repo status external/libnfc-nxp
+
+... A new version of repo (2.12) is available.
+... You should upgrade soon:
+    cp /media/herrie/HaliumDisk/9.0/.repo/repo/repo /home/herrie/bin/repo
+
+nothing to commit (working directory clean)
++ cd 9.0/external/libnfc-nxp
+./extract-headersnew.sh: 329: cd: can't cd to 9.0/external/libnfc-nxp
++ git show-ref --head
+fatal: not a git repository (or any parent up to mount point /media/herrie)
+Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
++ git remote -v
+fatal: not a git repository (or any parent up to mount point /media/herrie)
+Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
+
+

hardware/audio_amplifier.h

@@ -0,0 +1,157 @@
+/*
+ * Copyright (C) 2015, The CyanogenMod 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.
+ */
+
+#ifndef CM_AUDIO_AMPLIFIER_INTERFACE_H
+#define CM_AUDIO_AMPLIFIER_INTERFACE_H
+
+#include <stdint.h>
+#include <sys/cdefs.h>
+#include <sys/types.h>
+
+#include <hardware/audio.h>
+#include <hardware/hardware.h>
+
+#include <system/audio.h>
+
+__BEGIN_DECLS
+
+#define AMPLIFIER_HARDWARE_MODULE_ID "audio_amplifier"
+
+#define AMPLIFIER_HARDWARE_INTERFACE "audio_amplifier_hw_if"
+
+#define AMPLIFIER_MODULE_API_VERSION_0_1 HARDWARE_MODULE_API_VERSION(0, 1)
+
+#define AMPLIFIER_DEVICE_API_VERSION_1_0 HARDWARE_DEVICE_API_VERSION(1, 0)
+#define AMPLIFIER_DEVICE_API_VERSION_2_0 HARDWARE_DEVICE_API_VERSION(2, 0)
+#define AMPLIFIER_DEVICE_API_VERSION_2_1 HARDWARE_DEVICE_API_VERSION(2, 1)
+#define AMPLIFIER_DEVICE_API_VERSION_CURRENT AMPLIFIER_DEVICE_API_VERSION_2_1
+
+struct str_parms;
+
+typedef struct amplifier_device {
+    /**
+     * Common methods of the amplifier device. This *must* be the first member
+     * of amplifier_device as users of this structure will cast a hw_device_t
+     * to amplifier_device pointer in contexts where it's known
+     * the hw_device_t references a amplifier_device.
+     */
+    struct hw_device_t common;
+
+    /**
+     * Notify amplifier device of current input devices
+     *
+     * This function should handle only input devices.
+     */
+    int (*set_input_devices)(struct amplifier_device *device, uint32_t devices);
+
+    /**
+     * Notify amplifier device of current output devices
+     *
+     * This function should handle only output devices.
+     */
+    int (*set_output_devices)(struct amplifier_device *device, uint32_t devices);
+
+    /**
+     * Notify amplifier device of output device enable/disable
+     *
+     * This function should handle only output devices.
+     */
+    int (*enable_output_devices)(struct amplifier_device *device,
+            uint32_t devices, bool enable);
+
+    /**
+     * Notify amplifier device of input device enable/disable
+     *
+     * This function should handle only input devices.
+     */
+    int (*enable_input_devices)(struct amplifier_device *device,
+            uint32_t devices, bool enable);
+
+    /**
+     * Notify amplifier device about current audio mode
+     */
+    int (*set_mode)(struct amplifier_device *device, audio_mode_t mode);
+
+    /**
+     * Notify amplifier device that an output stream has started
+     */
+    int (*output_stream_start)(struct amplifier_device *device,
+            struct audio_stream_out *stream, bool offload);
+
+    /**
+     * Notify amplifier device that an input stream has started
+     */
+    int (*input_stream_start)(struct amplifier_device *device,
+            struct audio_stream_in *stream);
+
+    /**
+     * Notify amplifier device that an output stream has stopped
+     */
+    int (*output_stream_standby)(struct amplifier_device *device,
+            struct audio_stream_out *stream);
+
+    /**
+     * Notify amplifier device that an input stream has stopped
+     */
+    int (*input_stream_standby)(struct amplifier_device *device,
+            struct audio_stream_in *stream);
+
+    /**
+     * set/get audio device parameters.
+     */
+    int (*set_parameters)(struct amplifier_device *device,
+        struct str_parms *parms);
+
+    /**
+     * set/get output stream parameters.
+     */
+    int (*out_set_parameters)(struct amplifier_device *device,
+        struct str_parms *parms);
+
+    /**
+     * set/get input stream parameters.
+     */
+    int (*in_set_parameters)(struct amplifier_device *device,
+        struct str_parms *parms);
+} amplifier_device_t;
+
+typedef struct amplifier_module {
+    /**
+     * Common methods of the amplifier module. This *must* be the first member
+     * of amplifier_module as users of this structure will cast a hw_module_t
+     * to amplifier_module pointer in contexts where it's known
+     * the hw_module_t references a amplifier_module.
+     */
+    struct hw_module_t common;
+} amplifier_module_t;
+
+/** convenience API for opening and closing a supported device */
+
+static inline int amplifier_device_open(const struct hw_module_t *module,
+        struct amplifier_device **device)
+{
+    return module->methods->open(module, AMPLIFIER_HARDWARE_INTERFACE,
+            (struct hw_device_t **) device);
+}
+
+static inline int amplifier_device_close(struct amplifier_device *device)
+{
+    return device->common.close(&device->common);
+}
+
+__END_DECLS
+
+#endif  // CM_AUDIO_AMPLIFIER_INTERFACE_H

hardware/bluetooth.h

@@ -27,16 +27,7 @@
 
 __BEGIN_DECLS
 
-/**	
-* The Bluetooth Hardware Module ID
-*/
-
 #define BLUETOOTH_INTERFACE_STRING "bluetoothInterface"
-#define BT_HARDWARE_MODULE_ID "bluetooth"
-#define BT_STACK_MODULE_ID "bluetooth"
-#define BT_STACK_TEST_MODULE_ID "bluetooth_test"
-#define bluetooth_module_t "bluetooth_test"
-
 
 /** Bluetooth profile interface IDs */