Skip to content

Commit eec8956

Browse files
Herrie82Herrie82
committed
Headers 9.0 retry
1 parent 00543b4 commit eec8956

File tree

161 files changed

+117026
-53
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+117026
-53
lines changed

‎Makefile

+5-17
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,12 @@
11
PREFIX?=/usr/local
22
INCLUDEDIR?=$(PREFIX)/include/android
3-
PKGCONFIGDIR?=$(PREFIX)/lib/pkgconfig
43
all:
54
@echo "Use '$(MAKE) install' to install"
65

76
install:
87
mkdir -p $(DESTDIR)/$(INCLUDEDIR)
9-
mkdir -p $(DESTDIR)/$(PKGCONFIGDIR)
10-
cp android-config.h android-version.h $(DESTDIR)/$(INCLUDEDIR)
11-
cp android-headers.pc $(DESTDIR)/$(PKGCONFIGDIR)
12-
sed -i -e s:prefix=/usr:prefix=$(PREFIX):g $(DESTDIR)/$(PKGCONFIGDIR)/android-headers.pc
13-
cp -r android $(DESTDIR)/$(INCLUDEDIR)
14-
cp -r cutils $(DESTDIR)/$(INCLUDEDIR)
15-
cp -r hardware $(DESTDIR)/$(INCLUDEDIR)
16-
cp -r hardware_legacy $(DESTDIR)/$(INCLUDEDIR)
17-
cp -r linux $(DESTDIR)/$(INCLUDEDIR)
18-
cp -r log $(DESTDIR)/$(INCLUDEDIR)
19-
cp -r nativebase $(DESTDIR)/$(INCLUDEDIR)
20-
cp -r ndk $(DESTDIR)/$(INCLUDEDIR)
21-
cp -r private $(DESTDIR)/$(INCLUDEDIR)
22-
cp -r sync $(DESTDIR)/$(INCLUDEDIR)
23-
cp -r system $(DESTDIR)/$(INCLUDEDIR)
24-
cp -r vndk $(DESTDIR)/$(INCLUDEDIR)
8+
cp -r * $(DESTDIR)/$(INCLUDEDIR)
9+
rm -f $(DESTDIR)/$(INCLUDEDIR)/Makefile
10+
rm -f $(DESTDIR)/$(INCLUDEDIR)/android-headers.pc.in
11+
mkdir -p $(DESTDIR)/$(PREFIX)/lib/pkgconfig
12+
sed -e 's;@prefix@;$(PREFIX)/;g; s;@includedir@;$(INCLUDEDIR);g' android-headers.pc.in > $(DESTDIR)/$(PREFIX)/lib/pkgconfig/android-headers.pc

‎android-config.h

+2
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,6 @@
2121

2222
#include <android-version.h>
2323

24+
/* CONFIG GOES HERE */
25+
2426
#endif

‎android-headers.pc.in

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Name: android-headers
2+
Description: Provides the headers for the droid system
3+
Version: 9.0.0
4+
Cflags: -I@includedir@

‎git-revisions.txt

+148
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
================================================
2+
bionic @ Tue Apr 20 21:48:56 CEST 2021
3+
================================================
4+
+ cd 9.0
5+
+ repo status bionic
6+
7+
... A new version of repo (2.12) is available.
8+
... You should upgrade soon:
9+
cp /media/herrie/HaliumDisk/9.0/.repo/repo/repo /home/herrie/bin/repo
10+
11+
project bionic/ (*** NO BRANCH ***)
12+
prior sync failed; rebase still in progress
13+
+ cd 9.0/bionic
14+
./extract-headersnew.sh: 329: cd: can't cd to 9.0/bionic
15+
+ git show-ref --head
16+
fatal: not a git repository (or any parent up to mount point /media/herrie)
17+
Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
18+
+ git remote -v
19+
fatal: not a git repository (or any parent up to mount point /media/herrie)
20+
Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
21+
22+
23+
================================================
24+
hardware/libhardware @ Tue Apr 20 21:48:56 CEST 2021
25+
================================================
26+
+ cd 9.0
27+
+ repo status hardware/libhardware
28+
29+
... A new version of repo (2.12) is available.
30+
... You should upgrade soon:
31+
cp /media/herrie/HaliumDisk/9.0/.repo/repo/repo /home/herrie/bin/repo
32+
33+
nothing to commit (working directory clean)
34+
+ cd 9.0/hardware/libhardware
35+
./extract-headersnew.sh: 329: cd: can't cd to 9.0/hardware/libhardware
36+
+ git show-ref --head
37+
fatal: not a git repository (or any parent up to mount point /media/herrie)
38+
Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
39+
+ git remote -v
40+
fatal: not a git repository (or any parent up to mount point /media/herrie)
41+
Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
42+
43+
44+
================================================
45+
hardware/libhardware_legacy @ Tue Apr 20 21:48:56 CEST 2021
46+
================================================
47+
+ cd 9.0
48+
+ repo status hardware/libhardware_legacy
49+
50+
... A new version of repo (2.12) is available.
51+
... You should upgrade soon:
52+
cp /media/herrie/HaliumDisk/9.0/.repo/repo/repo /home/herrie/bin/repo
53+
54+
nothing to commit (working directory clean)
55+
+ cd 9.0/hardware/libhardware_legacy
56+
./extract-headersnew.sh: 329: cd: can't cd to 9.0/hardware/libhardware_legacy
57+
+ git show-ref --head
58+
fatal: not a git repository (or any parent up to mount point /media/herrie)
59+
Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
60+
+ git remote -v
61+
fatal: not a git repository (or any parent up to mount point /media/herrie)
62+
Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
63+
64+
65+
================================================
66+
system/core @ Tue Apr 20 21:48:56 CEST 2021
67+
================================================
68+
+ cd 9.0
69+
+ repo status system/core
70+
71+
... A new version of repo (2.12) is available.
72+
... You should upgrade soon:
73+
cp /media/herrie/HaliumDisk/9.0/.repo/repo/repo /home/herrie/bin/repo
74+
75+
nothing to commit (working directory clean)
76+
+ cd 9.0/system/core
77+
./extract-headersnew.sh: 329: cd: can't cd to 9.0/system/core
78+
+ git show-ref --head
79+
fatal: not a git repository (or any parent up to mount point /media/herrie)
80+
Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
81+
+ git remote -v
82+
fatal: not a git repository (or any parent up to mount point /media/herrie)
83+
Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
84+
85+
86+
================================================
87+
system/media @ Tue Apr 20 21:48:56 CEST 2021
88+
================================================
89+
+ cd 9.0
90+
+ repo status system/media
91+
92+
... A new version of repo (2.12) is available.
93+
... You should upgrade soon:
94+
cp /media/herrie/HaliumDisk/9.0/.repo/repo/repo /home/herrie/bin/repo
95+
96+
nothing to commit (working directory clean)
97+
+ cd 9.0/system/media
98+
./extract-headersnew.sh: 329: cd: can't cd to 9.0/system/media
99+
+ git show-ref --head
100+
fatal: not a git repository (or any parent up to mount point /media/herrie)
101+
Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
102+
+ git remote -v
103+
fatal: not a git repository (or any parent up to mount point /media/herrie)
104+
Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
105+
106+
107+
================================================
108+
external/kernel-headers @ Tue Apr 20 21:48:56 CEST 2021
109+
================================================
110+
+ cd 9.0
111+
+ repo status external/kernel-headers
112+
113+
... A new version of repo (2.12) is available.
114+
... You should upgrade soon:
115+
cp /media/herrie/HaliumDisk/9.0/.repo/repo/repo /home/herrie/bin/repo
116+
117+
nothing to commit (working directory clean)
118+
+ cd 9.0/external/kernel-headers
119+
./extract-headersnew.sh: 329: cd: can't cd to 9.0/external/kernel-headers
120+
+ git show-ref --head
121+
fatal: not a git repository (or any parent up to mount point /media/herrie)
122+
Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
123+
+ git remote -v
124+
fatal: not a git repository (or any parent up to mount point /media/herrie)
125+
Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
126+
127+
128+
================================================
129+
external/libnfc-nxp @ Tue Apr 20 21:48:56 CEST 2021
130+
================================================
131+
+ cd 9.0
132+
+ repo status external/libnfc-nxp
133+
134+
... A new version of repo (2.12) is available.
135+
... You should upgrade soon:
136+
cp /media/herrie/HaliumDisk/9.0/.repo/repo/repo /home/herrie/bin/repo
137+
138+
nothing to commit (working directory clean)
139+
+ cd 9.0/external/libnfc-nxp
140+
./extract-headersnew.sh: 329: cd: can't cd to 9.0/external/libnfc-nxp
141+
+ git show-ref --head
142+
fatal: not a git repository (or any parent up to mount point /media/herrie)
143+
Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
144+
+ git remote -v
145+
fatal: not a git repository (or any parent up to mount point /media/herrie)
146+
Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
147+
148+

‎hardware/audio.h

+11-5
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@
3030
#include <system/audio.h>
3131
#include <hardware/audio_effect.h>
3232

33+
#ifdef __ARM_PCS_VFP
34+
#define FP_ATTRIB __attribute__((pcs("aapcs")))
35+
#else
36+
#define FP_ATTRIB
37+
#endif
38+
3339
__BEGIN_DECLS
3440

3541
/**
@@ -250,7 +256,7 @@ struct audio_stream_out {
250256
* This method might produce multiple PCM outputs or hardware accelerated
251257
* codecs, such as MP3 or AAC.
252258
*/
253-
int (*set_volume)(struct audio_stream_out *stream, float left, float right);
259+
int (*set_volume)(struct audio_stream_out *stream, float left, float right) FP_ATTRIB;
254260

255261
/**
256262
* Write audio buffer to driver. Returns number of bytes written, or a
@@ -434,7 +440,7 @@ struct audio_stream_in {
434440

435441
/** set the input gain for the audio driver. This method is for
436442
* for future use */
437-
int (*set_gain)(struct audio_stream_in *stream, float gain);
443+
int (*set_gain)(struct audio_stream_in *stream, float gain) FP_ATTRIB;
438444

439445
/** Read audio buffer in from audio driver. Returns number of bytes read, or a
440446
* negative status_t. If at least one frame was read prior to the error,
@@ -649,14 +655,14 @@ struct audio_hw_device {
649655
int (*init_check)(const struct audio_hw_device *dev);
650656

651657
/** set the audio volume of a voice call. Range is between 0.0 and 1.0 */
652-
int (*set_voice_volume)(struct audio_hw_device *dev, float volume);
658+
int (*set_voice_volume)(struct audio_hw_device *dev, float volume) FP_ATTRIB;
653659

654660
/**
655661
* set the audio volume for all audio activities other than voice call.
656662
* Range between 0.0 and 1.0. If any value other than 0 is returned,
657663
* the software mixer will emulate this capability.
658664
*/
659-
int (*set_master_volume)(struct audio_hw_device *dev, float volume);
665+
int (*set_master_volume)(struct audio_hw_device *dev, float volume) FP_ATTRIB;
660666

661667
/**
662668
* Get the current master volume value for the HAL, if the HAL supports
@@ -665,7 +671,7 @@ struct audio_hw_device {
665671
* the initial master volume across all HALs. HALs which do not support
666672
* this method may leave it set to NULL.
667673
*/
668-
int (*get_master_volume)(struct audio_hw_device *dev, float *volume);
674+
int (*get_master_volume)(struct audio_hw_device *dev, float *volume) FP_ATTRIB;
669675

670676
/**
671677
* set_mode is called when the audio mode changes. AUDIO_MODE_NORMAL mode

0 commit comments

Comments
 (0)