diff options
author | Andrii Beregovenko | 2012-10-01 08:09:23 -0500 |
---|---|---|
committer | Andrii Beregovenko | 2012-12-12 08:16:03 -0600 |
commit | 0b46789d89bc00ac446e08c1b06ff9dcc9f371d3 (patch) | |
tree | 0898cfa50beb6824ddaeb82684702864d424487a | |
parent | 4bffebbfdf03b21e8727e5353faa369ee127d9e5 (diff) | |
download | device-ti-common-open-0b46789d89bc00ac446e08c1b06ff9dcc9f371d3.tar.gz device-ti-common-open-0b46789d89bc00ac446e08c1b06ff9dcc9f371d3.tar.xz device-ti-common-open-0b46789d89bc00ac446e08c1b06ff9dcc9f371d3.zip |
cpcam: add CPCAM product to common-open
Move CPCAM from device/ti/blaze_tablet to common-open cause this product
is not the only blaze_tablet specific product, and should be shareable
to other devices like blaze.
This patch should be merged togeather with:
http://review.omapzoom.org/30884 (update cpcam def in blaze_tablet)
http://review.omapzoom.org/30886 (update cpcam use in blaze device)
Change-Id: I0a2fb62750e011515288d9d42639a74039d6ba3a
Signed-off-by: Andrii Beregovenko <a.beregovenko@ti.com>
-rw-r--r-- | cpcam/Android.mk | 22 | ||||
-rw-r--r-- | cpcam/cpcam-products.mk | 22 | ||||
-rw-r--r-- | cpcam/products/AndroidProducts.mk | 27 | ||||
-rw-r--r-- | cpcam/products/cpcam_sdk_addon.mk | 50 | ||||
-rw-r--r-- | cpcam/products/stub_defs.txt | 18 | ||||
-rw-r--r-- | cpcam/sdk_addon/hardware.ini | 19 | ||||
-rw-r--r-- | cpcam/sdk_addon/manifest.ini | 61 |
7 files changed, 219 insertions, 0 deletions
diff --git a/cpcam/Android.mk b/cpcam/Android.mk new file mode 100644 index 0000000..1ce211a --- /dev/null +++ b/cpcam/Android.mk | |||
@@ -0,0 +1,22 @@ | |||
1 | # | ||
2 | # Copyright (C) 2012 Texas Instruments | ||
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 | ifeq ($(OMAP_ENHANCEMENT_CPCAM), true) | ||
17 | include_cpcam_makefiles = yes | ||
18 | endif | ||
19 | |||
20 | ifdef include_cpcam_makefiles | ||
21 | include $(call all-subdir-makefiles) | ||
22 | endif | ||
diff --git a/cpcam/cpcam-products.mk b/cpcam/cpcam-products.mk new file mode 100644 index 0000000..ef03dba --- /dev/null +++ b/cpcam/cpcam-products.mk | |||
@@ -0,0 +1,22 @@ | |||
1 | # | ||
2 | # Copyright (C) 2012 Texas Instruments | ||
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 | PRODUCT_PACKAGES += \ | ||
18 | com.ti.omap.android.cpcam \ | ||
19 | libcpcam_jni | ||
20 | |||
21 | PRODUCT_COPY_FILES := \ | ||
22 | hardware/ti/omap4xxx/cpcam/com.ti.omap.android.cpcam.xml:system/etc/permissions/com.ti.omap.android.cpcam.xml | ||
diff --git a/cpcam/products/AndroidProducts.mk b/cpcam/products/AndroidProducts.mk new file mode 100644 index 0000000..c6a3970 --- /dev/null +++ b/cpcam/products/AndroidProducts.mk | |||
@@ -0,0 +1,27 @@ | |||
1 | # | ||
2 | # Copyright (C) 2012 Texas Instruments | ||
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 | # This file should set PRODUCT_MAKEFILES to a list of product makefiles | ||
17 | # to expose to the build system. LOCAL_DIR will already be set to | ||
18 | # the directory containing this file. | ||
19 | # | ||
20 | # This file may not rely on the value of any variable other than | ||
21 | # LOCAL_DIR; do not use any conditionals, and do not look up the | ||
22 | # value of any variable that isn't set in this file or in a file that | ||
23 | # it includes. | ||
24 | # | ||
25 | |||
26 | PRODUCT_MAKEFILES := \ | ||
27 | $(LOCAL_DIR)/cpcam_sdk_addon.mk | ||
diff --git a/cpcam/products/cpcam_sdk_addon.mk b/cpcam/products/cpcam_sdk_addon.mk new file mode 100644 index 0000000..fc6132c --- /dev/null +++ b/cpcam/products/cpcam_sdk_addon.mk | |||
@@ -0,0 +1,50 @@ | |||
1 | # | ||
2 | # Copyright (C) 2012 Texas Instruments | ||
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 | # List of apps and optional libraries (Java and native) to put in the add-on system image. | ||
18 | PRODUCT_PACKAGES := \ | ||
19 | com.ti.omap.android.cpcam \ | ||
20 | libcpcam_jni | ||
21 | |||
22 | # Manually copy the optional library XML files in the system image. | ||
23 | PRODUCT_COPY_FILES := \ | ||
24 | hardware/ti/omap4xxx/cpcam/com.ti.omap.android.cpcam.xml:system/etc/permissions/com.ti.omap.android.cpcam.xml | ||
25 | |||
26 | # name of the add-on | ||
27 | PRODUCT_SDK_ADDON_NAME := cpcam | ||
28 | |||
29 | # Copy the manifest and hardware files for the SDK add-on. | ||
30 | # The content of those files is manually created for now. | ||
31 | PRODUCT_SDK_ADDON_COPY_FILES := \ | ||
32 | device/ti/common-open/cpcam/sdk_addon/manifest.ini:manifest.ini \ | ||
33 | device/ti/common-open/cpcam/sdk_addon/hardware.ini:hardware.ini \ | ||
34 | $(call find-copy-subdir-files,*,device/sample/skins/WVGAMedDpi,skins/WVGAMedDpi) | ||
35 | |||
36 | # Copy the jar files for the optional libraries that are exposed as APIs. | ||
37 | PRODUCT_SDK_ADDON_COPY_MODULES := \ | ||
38 | com.ti.omap.android.cpcam:libs/cpcam.jar | ||
39 | |||
40 | PRODUCT_SDK_ADDON_STUB_DEFS += \ | ||
41 | device/ti/common-open/cpcam/products/stub_defs.txt | ||
42 | |||
43 | PRODUCT_SDK_ADDON_DOC_MODULES := cpcam | ||
44 | |||
45 | # This add-on extends the default sdk product. | ||
46 | $(call inherit-product, $(SRC_TARGET_DIR)/product/sdk.mk) | ||
47 | |||
48 | # Real name of the add-on. This is the name used to build the add-on. | ||
49 | # Use 'make PRODUCT-cpcam-sdk_addon' to build the add-on. | ||
50 | PRODUCT_NAME := cpcam | ||
diff --git a/cpcam/products/stub_defs.txt b/cpcam/products/stub_defs.txt new file mode 100644 index 0000000..7e13249 --- /dev/null +++ b/cpcam/products/stub_defs.txt | |||
@@ -0,0 +1,18 @@ | |||
1 | # | ||
2 | # Copyright (C) 2012 Texas Instruments | ||
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 | |||
18 | +com.ti.omap.android.cpcam.* | ||
diff --git a/cpcam/sdk_addon/hardware.ini b/cpcam/sdk_addon/hardware.ini new file mode 100644 index 0000000..36e18bb --- /dev/null +++ b/cpcam/sdk_addon/hardware.ini | |||
@@ -0,0 +1,19 @@ | |||
1 | # | ||
2 | # Copyright (C) 2012 Texas Instruments | ||
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 | # Custom hardware options for the add-on. | ||
18 | # Properties defined here impact all AVD targetting this add-on. | ||
19 | # Each skin can also override those values with its own hardware.ini file. | ||
diff --git a/cpcam/sdk_addon/manifest.ini b/cpcam/sdk_addon/manifest.ini new file mode 100644 index 0000000..9222efc --- /dev/null +++ b/cpcam/sdk_addon/manifest.ini | |||
@@ -0,0 +1,61 @@ | |||
1 | # | ||
2 | # Copyright (C) 2012 Texas Instruments | ||
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 | |||
18 | # SDK Add-on Manifest | ||
19 | # File encoding is UTF-8 | ||
20 | |||
21 | # Name and vendor of the add-on. | ||
22 | # Add-ons are uniquely identified by a string composed of name, vendor and api. | ||
23 | # 2 add-ons with the same identifier cannot be installed in the same SDK | ||
24 | # and only the add-on with the highest rev number will be installed. | ||
25 | # Name and vendor are used to create folder names, so they shouldn't contain | ||
26 | # any special characters. Also, the character ':' is forbidden. | ||
27 | # Mandatory character set: a-z A-Z 0-9 _.- | ||
28 | name=TI OMAP Add-On | ||
29 | vendor=Texas Instruments Inc | ||
30 | description=Android extensions for TI OMAP platform | ||
31 | |||
32 | # version of the Android platform on which this add-on is built. | ||
33 | api=15 | ||
34 | |||
35 | # revision of the add-on. This must be a strict integer. | ||
36 | revision=1 | ||
37 | |||
38 | # list of libraries, separated by a semi-colon. | ||
39 | # This must be the name of the libraries, as required by the | ||
40 | # <uses-library> node in the AndroidManifest.xml file. | ||
41 | libraries=com.ti.omap.android.cpcam | ||
42 | |||
43 | # details for each library. format is: | ||
44 | # <library.name>=<name>.jar;<desc> | ||
45 | # where | ||
46 | # <library.name>: the name of the library defined in the property "libraries" above. | ||
47 | # <name>.jar: the jar file containing the library API. This is to be located in | ||
48 | # the add-on folder in libs/ | ||
49 | com.ti.omap.android.cpcam=cpcam.jar;TI OMAP plaform library | ||
50 | |||
51 | # default skin name. Optional. Only useful if the add-on has its own skin, or | ||
52 | # if it wishes to override the default skin of the base platform. | ||
53 | # This should be the name of the skin in the skins/ folder of the add-on. | ||
54 | skin=WVGAMedDpi | ||
55 | |||
56 | # USB Vendor ID | ||
57 | # This 16-bit integer allows adb to detect new devices, by extending the list | ||
58 | # of USB Vendor IDs it knows. After installing an add-on the command | ||
59 | # 'android update' adb' must be run to update a file that adb reads during | ||
60 | # start-up. | ||
61 | #usb-vendor=0x0000 | ||