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,148 @@
+================================================
+bionic @ Tue Apr 20 21:48:56 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
+
+project bionic/                                 (*** NO BRANCH ***)
+prior sync failed; rebase still in progress
++ 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 21:48:56 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 21:48:56 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 21:48:56 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 21:48:56 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 21:48:56 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 21:48:56 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.h

@@ -30,6 +30,12 @@
 #include <system/audio.h>
 #include <hardware/audio_effect.h>
 
+#ifdef __ARM_PCS_VFP
+#define FP_ATTRIB __attribute__((pcs("aapcs")))
+#else
+#define FP_ATTRIB
+#endif
+
 __BEGIN_DECLS
 
 /**
@@ -250,7 +256,7 @@ struct audio_stream_out {
      * This method might produce multiple PCM outputs or hardware accelerated
      * codecs, such as MP3 or AAC.
      */
-    int (*set_volume)(struct audio_stream_out *stream, float left, float right);
+    int (*set_volume)(struct audio_stream_out *stream, float left, float right) FP_ATTRIB;
 
     /**
      * Write audio buffer to driver. Returns number of bytes written, or a
@@ -434,7 +440,7 @@ struct audio_stream_in {
 
     /** set the input gain for the audio driver. This method is for
      *  for future use */
-    int (*set_gain)(struct audio_stream_in *stream, float gain);
+    int (*set_gain)(struct audio_stream_in *stream, float gain) FP_ATTRIB;
 
     /** Read audio buffer in from audio driver. Returns number of bytes read, or a
      *  negative status_t. If at least one frame was read prior to the error,
@@ -649,14 +655,14 @@ struct audio_hw_device {
     int (*init_check)(const struct audio_hw_device *dev);
 
     /** set the audio volume of a voice call. Range is between 0.0 and 1.0 */
-    int (*set_voice_volume)(struct audio_hw_device *dev, float volume);
+    int (*set_voice_volume)(struct audio_hw_device *dev, float volume) FP_ATTRIB;
 
     /**
      * set the audio volume for all audio activities other than voice call.
      * Range between 0.0 and 1.0. If any value other than 0 is returned,
      * the software mixer will emulate this capability.
      */
-    int (*set_master_volume)(struct audio_hw_device *dev, float volume);
+    int (*set_master_volume)(struct audio_hw_device *dev, float volume) FP_ATTRIB;
 
     /**
      * Get the current master volume value for the HAL, if the HAL supports
@@ -665,7 +671,7 @@ struct audio_hw_device {
      * the initial master volume across all HALs.  HALs which do not support
      * this method may leave it set to NULL.
      */
-    int (*get_master_volume)(struct audio_hw_device *dev, float *volume);
+    int (*get_master_volume)(struct audio_hw_device *dev, float *volume) FP_ATTRIB;
 
     /**
      * set_mode is called when the audio mode changes. AUDIO_MODE_NORMAL mode