diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2012-02-22 12:39:13 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-22 12:39:13 -0800 |
commit | 9379ac3878f8ef104eb540566048d56577004190 (patch) | |
tree | ba992ff3ee22c4100ce83859302c88c6aaa5fa19 | |
parent | f8e737cb61ab86b90ec318591fbcfec40fac63cf (diff) | |
parent | 1cd83102d4950327a6bd76f27b5d320d77e4bf84 (diff) | |
download | frameworks_base-9379ac3878f8ef104eb540566048d56577004190.zip frameworks_base-9379ac3878f8ef104eb540566048d56577004190.tar.gz frameworks_base-9379ac3878f8ef104eb540566048d56577004190.tar.bz2 |
am 1cd83102: am b92aee4e: am 69e9c30c: Merge "Add stubs for improved compatibility"
* commit '1cd83102d4950327a6bd76f27b5d320d77e4bf84':
Add stubs for improved compatibility
-rw-r--r-- | include/androidfw/Asset.h | 17 | ||||
-rw-r--r-- | include/androidfw/AssetManager.h | 17 | ||||
-rw-r--r-- | include/androidfw/KeycodeLabels.h | 17 | ||||
-rw-r--r-- | include/androidfw/ResourceTypes.h | 17 | ||||
-rw-r--r-- | libs/androidfw/Android.mk | 21 | ||||
-rw-r--r-- | libs/androidfw/Dummy.cpp | 18 |
6 files changed, 107 insertions, 0 deletions
diff --git a/include/androidfw/Asset.h b/include/androidfw/Asset.h new file mode 100644 index 0000000..3c57b1c --- /dev/null +++ b/include/androidfw/Asset.h @@ -0,0 +1,17 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include <utils/Asset.h> diff --git a/include/androidfw/AssetManager.h b/include/androidfw/AssetManager.h new file mode 100644 index 0000000..8cc3531 --- /dev/null +++ b/include/androidfw/AssetManager.h @@ -0,0 +1,17 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include <utils/AssetManager.h> diff --git a/include/androidfw/KeycodeLabels.h b/include/androidfw/KeycodeLabels.h new file mode 100644 index 0000000..615a627 --- /dev/null +++ b/include/androidfw/KeycodeLabels.h @@ -0,0 +1,17 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include <ui/KeycodeLabels.h> diff --git a/include/androidfw/ResourceTypes.h b/include/androidfw/ResourceTypes.h new file mode 100644 index 0000000..70cdc88 --- /dev/null +++ b/include/androidfw/ResourceTypes.h @@ -0,0 +1,17 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include <utils/ResourceTypes.h> diff --git a/libs/androidfw/Android.mk b/libs/androidfw/Android.mk new file mode 100644 index 0000000..a0e1dad --- /dev/null +++ b/libs/androidfw/Android.mk @@ -0,0 +1,21 @@ +# Copyright (C) 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +LOCAL_PATH:= $(call my-dir) + +include $(CLEAR_VARS) +LOCAL_SRC_FILES:= Dummy.cpp +LOCAL_MODULE:= libandroidfw +LOCAL_MODULE_TAGS := optional +include $(BUILD_SHARED_LIBRARY) diff --git a/libs/androidfw/Dummy.cpp b/libs/androidfw/Dummy.cpp new file mode 100644 index 0000000..f4f0f54 --- /dev/null +++ b/libs/androidfw/Dummy.cpp @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +void Dummy() { +} |