system/hardware/interfaces
Révision | 751427f1a89c99a1eb9208e7191b96ad5361cfd8 (tree) |
---|---|
l'heure | 2017-11-14 10:01:24 |
Auteur | Steven Moreland <smoreland@goog...> |
Commiter | android-build-merger |
Update makefiles for hidl_interface. am: c15b482924
am: 1e9c7e125f
Change-Id: Ie2e32c3983cd9f2fbfc266b094355c43e72cbe99
@@ -1,8 +1,4 @@ | ||
1 | -// This is an autogenerated file, do not edit. | |
2 | -subdirs = [ | |
3 | - "net/netd/1.0", | |
4 | - "net/netd/1.0/vts/functional", | |
5 | - "wifi/keystore/1.0", | |
6 | - "wifi/keystore/1.0/default", | |
7 | - "wifi/keystore/1.0/vts/functional", | |
8 | -] | |
1 | +hidl_package_root { | |
2 | + name: "android.system", | |
3 | + path: "system/hardware/interfaces", | |
4 | +} |
@@ -1,62 +1,17 @@ | ||
1 | -// This file is autogenerated by hidl-gen. Do not edit manually. | |
1 | +// This file is autogenerated by hidl-gen -Landroidbp. | |
2 | 2 | |
3 | -filegroup { | |
4 | - name: "android.system.net.netd@1.0_hal", | |
5 | - srcs: [ | |
6 | - "INetd.hal", | |
7 | - ], | |
8 | -} | |
9 | - | |
10 | -genrule { | |
11 | - name: "android.system.net.netd@1.0_genc++", | |
12 | - tools: ["hidl-gen"], | |
13 | - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hidl:system/libhidl/transport -randroid.system:system/hardware/interfaces android.system.net.netd@1.0", | |
14 | - srcs: [ | |
15 | - ":android.system.net.netd@1.0_hal", | |
16 | - ], | |
17 | - out: [ | |
18 | - "android/system/net/netd/1.0/NetdAll.cpp", | |
19 | - ], | |
20 | -} | |
21 | - | |
22 | -genrule { | |
23 | - name: "android.system.net.netd@1.0_genc++_headers", | |
24 | - tools: ["hidl-gen"], | |
25 | - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hidl:system/libhidl/transport -randroid.system:system/hardware/interfaces android.system.net.netd@1.0", | |
26 | - srcs: [ | |
27 | - ":android.system.net.netd@1.0_hal", | |
28 | - ], | |
29 | - out: [ | |
30 | - "android/system/net/netd/1.0/INetd.h", | |
31 | - "android/system/net/netd/1.0/IHwNetd.h", | |
32 | - "android/system/net/netd/1.0/BnHwNetd.h", | |
33 | - "android/system/net/netd/1.0/BpHwNetd.h", | |
34 | - "android/system/net/netd/1.0/BsNetd.h", | |
35 | - ], | |
36 | -} | |
37 | - | |
38 | -cc_library { | |
3 | +hidl_interface { | |
39 | 4 | name: "android.system.net.netd@1.0", |
40 | - defaults: ["hidl-module-defaults"], | |
41 | - generated_sources: ["android.system.net.netd@1.0_genc++"], | |
42 | - generated_headers: ["android.system.net.netd@1.0_genc++_headers"], | |
43 | - export_generated_headers: ["android.system.net.netd@1.0_genc++_headers"], | |
44 | - vendor_available: true, | |
5 | + root: "android.system", | |
45 | 6 | vndk: { |
46 | 7 | enabled: true, |
47 | 8 | }, |
48 | - shared_libs: [ | |
49 | - "libhidlbase", | |
50 | - "libhidltransport", | |
51 | - "libhwbinder", | |
52 | - "liblog", | |
53 | - "libutils", | |
54 | - "libcutils", | |
9 | + srcs: [ | |
10 | + "INetd.hal", | |
55 | 11 | ], |
56 | - export_shared_lib_headers: [ | |
57 | - "libhidlbase", | |
58 | - "libhidltransport", | |
59 | - "libhwbinder", | |
60 | - "libutils", | |
12 | + interfaces: [ | |
13 | + "android.hidl.base@1.0", | |
61 | 14 | ], |
15 | + gen_java: true, | |
62 | 16 | } |
17 | + |
@@ -1,162 +1,17 @@ | ||
1 | -// This file is autogenerated by hidl-gen. Do not edit manually. | |
1 | +// This file is autogenerated by hidl-gen -Landroidbp. | |
2 | 2 | |
3 | -filegroup { | |
4 | - name: "android.system.wifi.keystore@1.0_hal", | |
5 | - srcs: [ | |
6 | - "IKeystore.hal", | |
7 | - ], | |
8 | -} | |
9 | - | |
10 | -genrule { | |
11 | - name: "android.system.wifi.keystore@1.0_genc++", | |
12 | - tools: ["hidl-gen"], | |
13 | - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hidl:system/libhidl/transport -randroid.system:system/hardware/interfaces android.system.wifi.keystore@1.0", | |
14 | - srcs: [ | |
15 | - ":android.system.wifi.keystore@1.0_hal", | |
16 | - ], | |
17 | - out: [ | |
18 | - "android/system/wifi/keystore/1.0/KeystoreAll.cpp", | |
19 | - ], | |
20 | -} | |
21 | - | |
22 | -genrule { | |
23 | - name: "android.system.wifi.keystore@1.0_genc++_headers", | |
24 | - tools: ["hidl-gen"], | |
25 | - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hidl:system/libhidl/transport -randroid.system:system/hardware/interfaces android.system.wifi.keystore@1.0", | |
26 | - srcs: [ | |
27 | - ":android.system.wifi.keystore@1.0_hal", | |
28 | - ], | |
29 | - out: [ | |
30 | - "android/system/wifi/keystore/1.0/IKeystore.h", | |
31 | - "android/system/wifi/keystore/1.0/IHwKeystore.h", | |
32 | - "android/system/wifi/keystore/1.0/BnHwKeystore.h", | |
33 | - "android/system/wifi/keystore/1.0/BpHwKeystore.h", | |
34 | - "android/system/wifi/keystore/1.0/BsKeystore.h", | |
35 | - ], | |
36 | -} | |
37 | - | |
38 | -cc_library { | |
3 | +hidl_interface { | |
39 | 4 | name: "android.system.wifi.keystore@1.0", |
40 | - defaults: ["hidl-module-defaults"], | |
41 | - generated_sources: ["android.system.wifi.keystore@1.0_genc++"], | |
42 | - generated_headers: ["android.system.wifi.keystore@1.0_genc++_headers"], | |
43 | - export_generated_headers: ["android.system.wifi.keystore@1.0_genc++_headers"], | |
44 | - vendor_available: true, | |
5 | + root: "android.system", | |
45 | 6 | vndk: { |
46 | 7 | enabled: true, |
47 | 8 | }, |
48 | - shared_libs: [ | |
49 | - "libhidlbase", | |
50 | - "libhidltransport", | |
51 | - "libhwbinder", | |
52 | - "liblog", | |
53 | - "libutils", | |
54 | - "libcutils", | |
55 | - ], | |
56 | - export_shared_lib_headers: [ | |
57 | - "libhidlbase", | |
58 | - "libhidltransport", | |
59 | - "libhwbinder", | |
60 | - "libutils", | |
61 | - ], | |
62 | -} | |
63 | - | |
64 | -genrule { | |
65 | - name: "android.system.wifi.keystore-V1.0-java_gen_java", | |
66 | - tools: ["hidl-gen"], | |
67 | - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hidl:system/libhidl/transport -randroid.system:system/hardware/interfaces android.system.wifi.keystore@1.0", | |
68 | - srcs: [ | |
69 | - ":android.system.wifi.keystore@1.0_hal", | |
70 | - ], | |
71 | - out: [ | |
72 | - "android/system/wifi/keystore/V1_0/IKeystore.java", | |
73 | - ], | |
74 | -} | |
75 | - | |
76 | -java_library { | |
77 | - name: "android.system.wifi.keystore-V1.0-java", | |
78 | - no_framework_libs: true, | |
79 | - defaults: ["hidl-java-module-defaults"], | |
80 | - srcs: [":android.system.wifi.keystore-V1.0-java_gen_java"], | |
81 | - libs: [ | |
82 | - "hwbinder", | |
83 | - "android.hidl.base-V1.0-java", | |
84 | - ] | |
85 | -} | |
86 | - | |
87 | -// This package does not export any types. Not creating java constants export. | |
88 | - | |
89 | - | |
90 | -genrule { | |
91 | - name: "android.system.wifi.keystore@1.0-adapter-helper_genc++", | |
92 | - tools: ["hidl-gen"], | |
93 | - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hidl:system/libhidl/transport -randroid.system:system/hardware/interfaces android.system.wifi.keystore@1.0", | |
94 | 9 | srcs: [ |
95 | - ":android.system.wifi.keystore@1.0_hal", | |
96 | - ], | |
97 | - out: [ | |
98 | - "android/system/wifi/keystore/1.0/AKeystore.cpp", | |
99 | - ], | |
100 | -} | |
101 | - | |
102 | -genrule { | |
103 | - name: "android.system.wifi.keystore@1.0-adapter-helper_genc++_headers", | |
104 | - tools: ["hidl-gen"], | |
105 | - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hidl:system/libhidl/transport -randroid.system:system/hardware/interfaces android.system.wifi.keystore@1.0", | |
106 | - srcs: [ | |
107 | - ":android.system.wifi.keystore@1.0_hal", | |
108 | - ], | |
109 | - out: [ | |
110 | - "android/system/wifi/keystore/1.0/AKeystore.h", | |
111 | - ], | |
112 | -} | |
113 | - | |
114 | -cc_library { | |
115 | - name: "android.system.wifi.keystore@1.0-adapter-helper", | |
116 | - defaults: ["hidl-module-defaults"], | |
117 | - generated_sources: ["android.system.wifi.keystore@1.0-adapter-helper_genc++"], | |
118 | - generated_headers: ["android.system.wifi.keystore@1.0-adapter-helper_genc++_headers"], | |
119 | - export_generated_headers: ["android.system.wifi.keystore@1.0-adapter-helper_genc++_headers"], | |
120 | - vendor_available: true, | |
121 | - shared_libs: [ | |
122 | - "libhidlbase", | |
123 | - "libhidltransport", | |
124 | - "libhwbinder", | |
125 | - "liblog", | |
126 | - "libutils", | |
127 | - "libcutils", | |
128 | - "libhidladapter", | |
129 | - "android.system.wifi.keystore@1.0", | |
130 | - "android.hidl.base@1.0-adapter-helper", | |
10 | + "IKeystore.hal", | |
131 | 11 | ], |
132 | - export_shared_lib_headers: [ | |
133 | - "libhidlbase", | |
134 | - "libhidltransport", | |
135 | - "libhwbinder", | |
136 | - "libutils", | |
137 | - "libhidladapter", | |
138 | - "android.system.wifi.keystore@1.0", | |
139 | - "android.hidl.base@1.0-adapter-helper", | |
12 | + interfaces: [ | |
13 | + "android.hidl.base@1.0", | |
140 | 14 | ], |
15 | + gen_java: true, | |
141 | 16 | } |
142 | 17 | |
143 | -genrule { | |
144 | - name: "android.system.wifi.keystore@1.0-adapter_genc++", | |
145 | - tools: ["hidl-gen"], | |
146 | - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hidl:system/libhidl/transport -randroid.system:system/hardware/interfaces android.system.wifi.keystore@1.0", | |
147 | - out: ["main.cpp"] | |
148 | -} | |
149 | - | |
150 | -cc_test { | |
151 | - name: "android.system.wifi.keystore@1.0-adapter", | |
152 | - defaults: ["hidl-module-defaults"], | |
153 | - shared_libs: [ | |
154 | - "libhidladapter", | |
155 | - "libhidlbase", | |
156 | - "libhidltransport", | |
157 | - "libutils", | |
158 | - "android.system.wifi.keystore@1.0", | |
159 | - "android.system.wifi.keystore@1.0-adapter-helper", | |
160 | - ], | |
161 | - generated_sources: ["android.system.wifi.keystore@1.0-adapter_genc++"], | |
162 | -} |