Skip to content

Commit b9542ac

Browse files
ljia5ljia5
committed
Change hdcpd make mehtod
Change to Android.bp for hdcp build Tracked-On: OAM- Signed-off-by: Jia, Lin A <lin.a.jia@intel.com>
1 parent e8f7d27 commit b9542ac

12 files changed

Lines changed: 372 additions & 0 deletions

File tree

‎Android.bp‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
//
2+
// Copyright (c) 2009-2018, Intel Corporation
3+
//
4+
// Permission is hereby granted, free of charge, to any person obtaining a
5+
// copy of this software and associated documentation files (the "Software"),
6+
// to deal in the Software without restriction, including without limitation
7+
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
8+
// and/or sell copies of the Software, and to permit persons to whom the
9+
// Software is furnished to do so, subject to the following conditions:
10+
//
11+
// The above copyright notice and this permission notice shall be included
12+
// in all copies or substantial portions of the Software.
13+
//
14+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
15+
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
17+
// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
18+
// OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
19+
// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
20+
// OTHER DEALINGS IN THE SOFTWARE.
21+
22+
// Recursively call sub-folder Android.mk

Android.mk renamed to Android.mk.bak

File renamed without changes.

‎common/Android.bp‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
//
2+
// Copyright (c) 2009-2018, Intel Corporation
3+
//
4+
// Permission is hereby granted, free of charge, to any person obtaining a
5+
// copy of this software and associated documentation files (the "Software"),
6+
// to deal in the Software without restriction, including without limitation
7+
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
8+
// and/or sell copies of the Software, and to permit persons to whom the
9+
// Software is furnished to do so, subject to the following conditions:
10+
//
11+
// The above copyright notice and this permission notice shall be included
12+
// in all copies or substantial portions of the Software.
13+
//
14+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
15+
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
17+
// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
18+
// OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
19+
// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
20+
// OTHER DEALINGS IN THE SOFTWARE.
21+
22+
cc_library_static {
23+
name: "libhdcpcommon",
24+
25+
cppflags: [
26+
"-DANDROID",
27+
"-DANDROID_VERSION=800",
28+
"-DLOG_TAG=\"HDCPCOMMON\"",
29+
] + ["-DLOG_CONSOLE"] + ["-Wno-error"], // LOG_CONSOLE will print ALOGI, ALOGE, ALOGW in Android. Enable on debug build
30+
// ANDROIDMK TRANSLATION ERROR: unsupported conditional
31+
// ifeq ($(TARGET_BUILD_VARIANT),userdebug)
32+
33+
// ANDROIDMK TRANSLATION ERROR: endif from unsupported conditional
34+
// endif
35+
36+
// For ALOGV and function enter/exit log, set ENABLE_DEBUG=1 during compilation e.g. mm ENABLE_DEBUG=1 -j32
37+
// ANDROIDMK TRANSLATION ERROR: unsupported conditional
38+
// ifeq ($(ENABLE_DEBUG),1)
39+
40+
// ANDROIDMK TRANSLATION ERROR: unsupported assignment to LOCAL_CPPFLAG
41+
// LOCAL_CPPFLAG += -DHDCP_USE_VERBOSE_LOGGING -DHDCP_USE_FUNCTION_LOGGING -DHDCP_USE_LINK_FUNCTION_LOGGING
42+
43+
// ANDROIDMK TRANSLATION ERROR: endif from unsupported conditional
44+
// endif
45+
46+
// ANDROIDMK TRANSLATION ERROR: unsupported conditional
47+
// ifeq ($(ENABLE_DEBUG),1)
48+
49+
// ANDROIDMK TRANSLATION ERROR: unsupported assignment to LOCAL_CPPFLAG
50+
// LOCAL_CPPFLAG += -DLOG_CONSOLE -DHDCP_USE_VERBOSE_LOGGING -DHDCP_USE_FUNCTION_LOGGING -DHDCP_USE_LINK_FUNCTION_LOGGING
51+
52+
// ANDROIDMK TRANSLATION ERROR: endif from unsupported conditional
53+
// endif
54+
55+
//WA
56+
57+
//local_include_dirs: [
58+
include_dirs: [
59+
"hardware/intel/external/media/hdcp/sdk",
60+
"hardware/intel/external/media/hdcp/common",
61+
],
62+
63+
shared_libs: [
64+
"libutils",
65+
"liblog",
66+
],
67+
68+
srcs: [
69+
"clientsock.cpp",
70+
"gensock.cpp",
71+
"servsock.cpp",
72+
"socketdata.cpp",
73+
],
74+
75+
proprietary: true,
76+
77+
}

common/Android.mk renamed to common/Android.mk.bak

File renamed without changes.

‎daemon/Android.bp‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
//
2+
// Copyright (c) 2009-2018, Intel Corporation
3+
//
4+
// Permission is hereby granted, free of charge, to any person obtaining a
5+
// copy of this software and associated documentation files (the "Software"),
6+
// to deal in the Software without restriction, including without limitation
7+
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
8+
// and/or sell copies of the Software, and to permit persons to whom the
9+
// Software is furnished to do so, subject to the following conditions:
10+
//
11+
// The above copyright notice and this permission notice shall be included
12+
// in all copies or substantial portions of the Software.
13+
//
14+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
15+
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
17+
// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
18+
// OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
19+
// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
20+
// OTHER DEALINGS IN THE SOFTWARE.
21+
22+
cc_binary {
23+
name: "hdcpd",
24+
25+
cppflags: [
26+
"-DANDROID",
27+
"-DUSES_IA_HWCOMPOSER",
28+
"-DANDROID_VERSION=800",
29+
"-DLOG_TAG=\"HDCPD\"",
30+
] + ["-DLOG_CONSOLE"] + [ // LOG_CONSOLE will print ALOGI, ALOGE, ALOGW in Android. Enable on debug build
31+
// ANDROIDMK TRANSLATION ERROR: unsupported conditional
32+
// ifeq ($(TARGET_BUILD_VARIANT),userdebug)
33+
34+
// ANDROIDMK TRANSLATION ERROR: endif from unsupported conditional
35+
// endif
36+
37+
// For ALOGV and function enter/exit log, set ENABLE_DEBUG=1 during compilation e.g. mm ENABLE_DEBUG=1 -j32
38+
// ANDROIDMK TRANSLATION ERROR: unsupported conditional
39+
// ifeq ($(ENABLE_DEBUG),1)
40+
41+
// ANDROIDMK TRANSLATION ERROR: unsupported assignment to LOCAL_CPPFLAG
42+
// LOCAL_CPPFLAG += -DHDCP_USE_VERBOSE_LOGGING -DHDCP_USE_FUNCTION_LOGGING -DHDCP_USE_LINK_FUNCTION_LOGGING
43+
44+
// ANDROIDMK TRANSLATION ERROR: endif from unsupported conditional
45+
// endif
46+
47+
// ANDROIDMK TRANSLATION ERROR: unsupported conditional
48+
// ifeq ($(ENABLE_DEBUG),1)
49+
50+
// ANDROIDMK TRANSLATION ERROR: unsupported assignment to LOCAL_CPPFLAG
51+
// LOCAL_CPPFLAG += -DLOG_CONSOLE -DHDCP_USE_VERBOSE_LOGGING -DHDCP_USE_FUNCTION_LOGGING -DHDCP_USE_LINK_FUNCTION_LOGGING
52+
53+
// ANDROIDMK TRANSLATION ERROR: endif from unsupported conditional
54+
// endif
55+
56+
//WA
57+
"-Wno-unused-parameter",
58+
"-Wno-error",
59+
],
60+
61+
shared_libs: [
62+
"libutils",
63+
"libbinder",
64+
"liblog",
65+
"libcrypto",
66+
"libdrm",
67+
"libssl",
68+
"libhwcservice",
69+
],
70+
71+
static_libs: ["libhdcpcommon"],
72+
73+
srcs: [
74+
"main.cpp",
75+
"daemon.cpp",
76+
"port.cpp",
77+
"srm.cpp",
78+
"portmanager.cpp",
79+
"portmanager_android.cpp",
80+
],
81+
82+
include_dirs: ["."] + [
83+
"hardware/intel/external/media/hdcp/sdk",
84+
"hardware/intel/external/media/hdcp/common",
85+
],
86+
87+
proprietary: true,
88+
89+
}

daemon/Android.mk renamed to daemon/Android.mk.bak

File renamed without changes.

‎sdk/Android.bp‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
//
2+
// Copyright (c) 2009-2018, Intel Corporation
3+
//
4+
// Permission is hereby granted, free of charge, to any person obtaining a
5+
// copy of this software and associated documentation files (the "Software"),
6+
// to deal in the Software without restriction, including without limitation
7+
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
8+
// and/or sell copies of the Software, and to permit persons to whom the
9+
// Software is furnished to do so, subject to the following conditions:
10+
//
11+
// The above copyright notice and this permission notice shall be included
12+
// in all copies or substantial portions of the Software.
13+
//
14+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
15+
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
17+
// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
18+
// OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
19+
// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
20+
// OTHER DEALINGS IN THE SOFTWARE.
21+
22+
cc_library_shared {
23+
name: "libhdcpsdk",
24+
25+
// For ALOGV and enter/exit log, set ENABLE_DEBUG=1 during compilation e.g. mm ENABLE_DEBUG=1 -j32
26+
cppflags: [
27+
"-DANDROID",
28+
"-DANDROID_VERSION=800",
29+
"-DLOG_TAG=\"HDCPSDK\"",
30+
] + ["-DLOG_CONSOLE"] + [ // LOG_CONSOLE will print ALOGI, ALOGE, ALOGW in Android. Enable on debug build
31+
// ANDROIDMK TRANSLATION ERROR: unsupported conditional
32+
// ifeq ($(TARGET_BUILD_VARIANT),userdebug)
33+
34+
// ANDROIDMK TRANSLATION ERROR: endif from unsupported conditional
35+
// endif
36+
37+
// For ALOGV and function enter/exit log, set ENABLE_DEBUG=1 during compilation e.g. mm ENABLE_DEBUG=1 -j32
38+
// ANDROIDMK TRANSLATION ERROR: unsupported conditional
39+
// ifeq ($(ENABLE_DEBUG),1)
40+
"-DHDCP_USE_VERBOSE_LOGGING",
41+
42+
// ANDROIDMK TRANSLATION ERROR: endif from unsupported conditional
43+
"-DHDCP_USE_FUNCTION_LOGGING",
44+
// endif
45+
"-DHDCP_USE_LINK_FUNCTION_LOGGING",
46+
47+
// ANDROIDMK TRANSLATION ERROR: unsupported conditional
48+
] + [ // ifeq ($(ENABLE_DEBUG),1)
49+
50+
// ANDROIDMK TRANSLATION ERROR: unsupported assignment to LOCAL_CPPFLAG
51+
// LOCAL_CPPFLAG += -DLOG_CONSOLE -DHDCP_USE_VERBOSE_LOGGING -DHDCP_USE_FUNCTION_LOGGING -DHDCP_USE_LINK_FUNCTION_LOGGING
52+
53+
// ANDROIDMK TRANSLATION ERROR: endif from unsupported conditional
54+
// endif
55+
56+
//WA
57+
"-Wno-unused-parameter",
58+
"-Wno-error",
59+
],
60+
61+
include_dirs: [
62+
"hardware/intel/external/media/hdcp/sdk",
63+
"hardware/intel/external/media/hdcp/daemon",
64+
"hardware/intel/external/media/hdcp/common",
65+
],
66+
67+
srcs: [
68+
"hdcpapi.cpp",
69+
"sessionmanager.cpp",
70+
"session.cpp",
71+
],
72+
73+
shared_libs: [
74+
"libutils",
75+
"liblog",
76+
],
77+
78+
static_libs: ["libhdcpcommon"],
79+
80+
export_include_dirs: [""],
81+
82+
proprietary: true,
83+
84+
}

sdk/Android.mk renamed to sdk/Android.mk.bak

File renamed without changes.

‎test/Android.bp‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
//
2+
// Copyright (c) 2009-2018, Intel Corporation
3+
//
4+
// Permission is hereby granted, free of charge, to any person obtaining a
5+
// copy of this software and associated documentation files (the "Software"),
6+
// to deal in the Software without restriction, including without limitation
7+
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
8+
// and/or sell copies of the Software, and to permit persons to whom the
9+
// Software is furnished to do so, subject to the following conditions:
10+
//
11+
// The above copyright notice and this permission notice shall be included
12+
// in all copies or substantial portions of the Software.
13+
//
14+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
15+
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
17+
// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
18+
// OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
19+
// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
20+
// OTHER DEALINGS IN THE SOFTWARE.
21+
22+
// Recursively call sub-folder Android.mk

test/Android.mk renamed to test/Android.mk.bak

File renamed without changes.

0 commit comments

Comments
 (0)