Skip to content

Commit 37049b1

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

File tree

159 files changed

+117019
-52
lines changed

Some content is hidden

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

159 files changed

+117019
-52
lines changed

Diff for: ‎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

Diff for: ‎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

Diff for: ‎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@

Diff for: ‎git-revisions.txt

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

Diff for: ‎hardware/audio_amplifier.h

+157
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,157 @@
1+
/*
2+
* Copyright (C) 2015, The CyanogenMod Project
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
#ifndef CM_AUDIO_AMPLIFIER_INTERFACE_H
18+
#define CM_AUDIO_AMPLIFIER_INTERFACE_H
19+
20+
#include <stdint.h>
21+
#include <sys/cdefs.h>
22+
#include <sys/types.h>
23+
24+
#include <hardware/audio.h>
25+
#include <hardware/hardware.h>
26+
27+
#include <system/audio.h>
28+
29+
__BEGIN_DECLS
30+
31+
#define AMPLIFIER_HARDWARE_MODULE_ID "audio_amplifier"
32+
33+
#define AMPLIFIER_HARDWARE_INTERFACE "audio_amplifier_hw_if"
34+
35+
#define AMPLIFIER_MODULE_API_VERSION_0_1 HARDWARE_MODULE_API_VERSION(0, 1)
36+
37+
#define AMPLIFIER_DEVICE_API_VERSION_1_0 HARDWARE_DEVICE_API_VERSION(1, 0)
38+
#define AMPLIFIER_DEVICE_API_VERSION_2_0 HARDWARE_DEVICE_API_VERSION(2, 0)
39+
#define AMPLIFIER_DEVICE_API_VERSION_2_1 HARDWARE_DEVICE_API_VERSION(2, 1)
40+
#define AMPLIFIER_DEVICE_API_VERSION_CURRENT AMPLIFIER_DEVICE_API_VERSION_2_1
41+
42+
struct str_parms;
43+
44+
typedef struct amplifier_device {
45+
/**
46+
* Common methods of the amplifier device. This *must* be the first member
47+
* of amplifier_device as users of this structure will cast a hw_device_t
48+
* to amplifier_device pointer in contexts where it's known
49+
* the hw_device_t references a amplifier_device.
50+
*/
51+
struct hw_device_t common;
52+
53+
/**
54+
* Notify amplifier device of current input devices
55+
*
56+
* This function should handle only input devices.
57+
*/
58+
int (*set_input_devices)(struct amplifier_device *device, uint32_t devices);
59+
60+
/**
61+
* Notify amplifier device of current output devices
62+
*
63+
* This function should handle only output devices.
64+
*/
65+
int (*set_output_devices)(struct amplifier_device *device, uint32_t devices);
66+
67+
/**
68+
* Notify amplifier device of output device enable/disable
69+
*
70+
* This function should handle only output devices.
71+
*/
72+
int (*enable_output_devices)(struct amplifier_device *device,
73+
uint32_t devices, bool enable);
74+
75+
/**
76+
* Notify amplifier device of input device enable/disable
77+
*
78+
* This function should handle only input devices.
79+
*/
80+
int (*enable_input_devices)(struct amplifier_device *device,
81+
uint32_t devices, bool enable);
82+
83+
/**
84+
* Notify amplifier device about current audio mode
85+
*/
86+
int (*set_mode)(struct amplifier_device *device, audio_mode_t mode);
87+
88+
/**
89+
* Notify amplifier device that an output stream has started
90+
*/
91+
int (*output_stream_start)(struct amplifier_device *device,
92+
struct audio_stream_out *stream, bool offload);
93+
94+
/**
95+
* Notify amplifier device that an input stream has started
96+
*/
97+
int (*input_stream_start)(struct amplifier_device *device,
98+
struct audio_stream_in *stream);
99+
100+
/**
101+
* Notify amplifier device that an output stream has stopped
102+
*/
103+
int (*output_stream_standby)(struct amplifier_device *device,
104+
struct audio_stream_out *stream);
105+
106+
/**
107+
* Notify amplifier device that an input stream has stopped
108+
*/
109+
int (*input_stream_standby)(struct amplifier_device *device,
110+
struct audio_stream_in *stream);
111+
112+
/**
113+
* set/get audio device parameters.
114+
*/
115+
int (*set_parameters)(struct amplifier_device *device,
116+
struct str_parms *parms);
117+
118+
/**
119+
* set/get output stream parameters.
120+
*/
121+
int (*out_set_parameters)(struct amplifier_device *device,
122+
struct str_parms *parms);
123+
124+
/**
125+
* set/get input stream parameters.
126+
*/
127+
int (*in_set_parameters)(struct amplifier_device *device,
128+
struct str_parms *parms);
129+
} amplifier_device_t;
130+
131+
typedef struct amplifier_module {
132+
/**
133+
* Common methods of the amplifier module. This *must* be the first member
134+
* of amplifier_module as users of this structure will cast a hw_module_t
135+
* to amplifier_module pointer in contexts where it's known
136+
* the hw_module_t references a amplifier_module.
137+
*/
138+
struct hw_module_t common;
139+
} amplifier_module_t;
140+
141+
/** convenience API for opening and closing a supported device */
142+
143+
static inline int amplifier_device_open(const struct hw_module_t *module,
144+
struct amplifier_device **device)
145+
{
146+
return module->methods->open(module, AMPLIFIER_HARDWARE_INTERFACE,
147+
(struct hw_device_t **) device);
148+
}
149+
150+
static inline int amplifier_device_close(struct amplifier_device *device)
151+
{
152+
return device->common.close(&device->common);
153+
}
154+
155+
__END_DECLS
156+
157+
#endif // CM_AUDIO_AMPLIFIER_INTERFACE_H

Diff for: ‎hardware/bluetooth.h

-9
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,7 @@
2727

2828
__BEGIN_DECLS
2929

30-
/**
31-
* The Bluetooth Hardware Module ID
32-
*/
33-
3430
#define BLUETOOTH_INTERFACE_STRING "bluetoothInterface"
35-
#define BT_HARDWARE_MODULE_ID "bluetooth"
36-
#define BT_STACK_MODULE_ID "bluetooth"
37-
#define BT_STACK_TEST_MODULE_ID "bluetooth_test"
38-
#define bluetooth_module_t "bluetooth_test"
39-
4031

4132
/** Bluetooth profile interface IDs */
4233

0 commit comments

Comments
 (0)