summaryrefslogtreecommitdiff
path: root/libs/androidfw/DynamicLibManager.cpp
diff options
context:
space:
mode:
authorRyan Mitchell <rtmitchell@google.com>2020-02-12 10:31:44 -0800
committerRyan Mitchell <rtmitchell@google.com>2020-03-23 18:05:40 -0700
commitb894c274d01f47911770a44151732a0139d81873 (patch)
treea1ff971e0355d44c940c2c55344800f4044e3d51 /libs/androidfw/DynamicLibManager.cpp
parent393c9121cea9e03762b3e5460d523b9d5393f6f7 (diff)
Revert "Assign shared libraries stable package ids"
This change must be reverted because it broke packages with the same package name but different package ids loaded at once. Bug: 146685730 Test: MultiSplitInstallTest This reverts commit fe50d739f75e13ebf64c010bf6ef504bcc81d860. Change-Id: If6364fd660c76284452f77e7d4f09a3df9dede1d
Diffstat (limited to 'libs/androidfw/DynamicLibManager.cpp')
-rw-r--r--libs/androidfw/DynamicLibManager.cpp34
1 files changed, 0 insertions, 34 deletions
diff --git a/libs/androidfw/DynamicLibManager.cpp b/libs/androidfw/DynamicLibManager.cpp
deleted file mode 100644
index 895b7695bf26..000000000000
--- a/libs/androidfw/DynamicLibManager.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2019 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 "androidfw/DynamicLibManager.h"
-
-namespace android {
-
-uint8_t DynamicLibManager::GetAssignedId(const std::string& library_package_name) {
- auto lib_entry = shared_lib_package_ids_.find(library_package_name);
- if (lib_entry != shared_lib_package_ids_.end()) {
- return lib_entry->second;
- }
-
- return shared_lib_package_ids_[library_package_name] = next_package_id_++;
-}
-
-uint8_t DynamicLibManager::FindUnassignedId(uint8_t start_package_id) {
- return (start_package_id < next_package_id_) ? next_package_id_ : start_package_id;
-}
-
-} // namespace android