summaryrefslogtreecommitdiff
path: root/cmds
diff options
context:
space:
mode:
Diffstat (limited to 'cmds')
-rw-r--r--cmds/app_process/Android.mk7
-rw-r--r--cmds/app_process/app_main.cpp12
-rw-r--r--cmds/bmgr/Android.mk15
-rw-r--r--cmds/bootanimation/BootAnimation.cpp1
-rw-r--r--cmds/ime/Android.mk15
-rw-r--r--cmds/input/Android.mk13
-rw-r--r--cmds/pm/Android.mk15
-rw-r--r--cmds/requestsync/src/com/android/commands/requestsync/RequestSync.java6
-rw-r--r--cmds/svc/Android.mk15
-rw-r--r--cmds/uiautomator/library/Android.mk6
10 files changed, 54 insertions, 51 deletions
diff --git a/cmds/app_process/Android.mk b/cmds/app_process/Android.mk
index fae0400a1212..e530184b9c6a 100644
--- a/cmds/app_process/Android.mk
+++ b/cmds/app_process/Android.mk
@@ -12,7 +12,8 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES:= \
app_main.cpp
-LOCAL_LDFLAGS := -Wl,--version-script,art/sigchainlib/version-script.txt -Wl,--export-dynamic
+LOCAL_LDFLAGS_32 := -Wl,--version-script,art/sigchainlib/version-script32.txt -Wl,--export-dynamic
+LOCAL_LDFLAGS_64 := -Wl,--version-script,art/sigchainlib/version-script64.txt -Wl,--export-dynamic
LOCAL_SHARED_LIBRARIES := \
libdl \
@@ -58,7 +59,9 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_WHOLE_STATIC_LIBRARIES := libsigchain
-LOCAL_LDFLAGS := -ldl -Wl,--version-script,art/sigchainlib/version-script.txt -Wl,--export-dynamic
+LOCAL_LDFLAGS := -ldl
+LOCAL_LDFLAGS_32 := -Wl,--version-script,art/sigchainlib/version-script32.txt -Wl,--export-dynamic
+LOCAL_LDFLAGS_64 := -Wl,--version-script,art/sigchainlib/version-script64.txt -Wl,--export-dynamic
LOCAL_CPPFLAGS := -std=c++11
LOCAL_MODULE := app_process__asan
diff --git a/cmds/app_process/app_main.cpp b/cmds/app_process/app_main.cpp
index 2e023825a219..18ad43eac37e 100644
--- a/cmds/app_process/app_main.cpp
+++ b/cmds/app_process/app_main.cpp
@@ -17,7 +17,6 @@
#include <binder/ProcessState.h>
#include <utils/Log.h>
#include <cutils/memory.h>
-#include <cutils/process_name.h>
#include <cutils/properties.h>
#include <cutils/trace.h>
#include <android_runtime/AndroidRuntime.h>
@@ -186,12 +185,7 @@ static const char ZYGOTE_NICE_NAME[] = "zygote";
int main(int argc, char* const argv[])
{
if (prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0) < 0) {
- // Older kernels don't understand PR_SET_NO_NEW_PRIVS and return
- // EINVAL. Don't die on such kernels.
- if (errno != EINVAL) {
- LOG_ALWAYS_FATAL("PR_SET_NO_NEW_PRIVS failed: %s", strerror(errno));
- return 12;
- }
+ LOG_ALWAYS_FATAL("PR_SET_NO_NEW_PRIVS failed: %s", strerror(errno));
}
AppRuntime runtime(argv[0], computeArgBlockSize(argc, argv));
@@ -299,8 +293,7 @@ int main(int argc, char* const argv[])
}
if (!niceName.isEmpty()) {
- runtime.setArgv0(niceName.string());
- set_process_name(niceName.string());
+ runtime.setArgv0(niceName.string(), true /* setProcName */);
}
if (zygote) {
@@ -311,6 +304,5 @@ int main(int argc, char* const argv[])
fprintf(stderr, "Error: no class name or --zygote supplied.\n");
app_usage();
LOG_ALWAYS_FATAL("app_process: no class name or --zygote supplied.");
- return 10;
}
}
diff --git a/cmds/bmgr/Android.mk b/cmds/bmgr/Android.mk
index 8a1670b2ccff..d520cf2143ee 100644
--- a/cmds/bmgr/Android.mk
+++ b/cmds/bmgr/Android.mk
@@ -1,15 +1,16 @@
# Copyright 2007 The Android Open Source Project
#
LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
+include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_MODULE := bmgr
+LOCAL_MODULE := bmgrlib
+LOCAL_MODULE_STEM := bmgr
include $(BUILD_JAVA_LIBRARY)
-
include $(CLEAR_VARS)
-ALL_PREBUILT += $(TARGET_OUT)/bin/bmgr
-$(TARGET_OUT)/bin/bmgr : $(LOCAL_PATH)/bmgr | $(ACP)
- $(transform-prebuilt-to-target)
-
+LOCAL_MODULE := bmgr
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_SRC_FILES := bmgr
+LOCAL_REQUIRED_MODULES := bmgrlib
+include $(BUILD_PREBUILT)
diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp
index 2fa1ee6b3869..c9211939ec6c 100644
--- a/cmds/bootanimation/BootAnimation.cpp
+++ b/cmds/bootanimation/BootAnimation.cpp
@@ -347,6 +347,7 @@ bool BootAnimation::threadLoop()
mFlingerSurface.clear();
mFlingerSurfaceControl.clear();
eglTerminate(mDisplay);
+ eglReleaseThread();
IPCThreadState::self()->stopProcess();
return r;
}
diff --git a/cmds/ime/Android.mk b/cmds/ime/Android.mk
index 90b1c9106cbc..6803fc01154c 100644
--- a/cmds/ime/Android.mk
+++ b/cmds/ime/Android.mk
@@ -1,15 +1,16 @@
# Copyright 2007 The Android Open Source Project
#
LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
+include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_MODULE := ime
+LOCAL_MODULE := imelib
+LOCAL_MODULE_STEM := ime
include $(BUILD_JAVA_LIBRARY)
-
include $(CLEAR_VARS)
-ALL_PREBUILT += $(TARGET_OUT)/bin/ime
-$(TARGET_OUT)/bin/ime : $(LOCAL_PATH)/ime | $(ACP)
- $(transform-prebuilt-to-target)
-
+LOCAL_MODULE := ime
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_SRC_FILES := ime
+LOCAL_REQUIRED_MODULES := imelib
+include $(BUILD_PREBUILT)
diff --git a/cmds/input/Android.mk b/cmds/input/Android.mk
index 3d5653328c40..4e983e398ccb 100644
--- a/cmds/input/Android.mk
+++ b/cmds/input/Android.mk
@@ -1,13 +1,16 @@
# Copyright 2008 The Android Open Source Project
#
LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
+include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_MODULE := input
+LOCAL_MODULE := inputlib
+LOCAL_MODULE_STEM := input
include $(BUILD_JAVA_LIBRARY)
include $(CLEAR_VARS)
-ALL_PREBUILT += $(TARGET_OUT)/bin/input
-$(TARGET_OUT)/bin/input : $(LOCAL_PATH)/input | $(ACP)
- $(transform-prebuilt-to-target)
+LOCAL_MODULE := input
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_SRC_FILES := input
+LOCAL_REQUIRED_MODULES := inputlib
+include $(BUILD_PREBUILT)
diff --git a/cmds/pm/Android.mk b/cmds/pm/Android.mk
index 7911d629ed8b..6a03defc9e2c 100644
--- a/cmds/pm/Android.mk
+++ b/cmds/pm/Android.mk
@@ -1,15 +1,16 @@
# Copyright 2007 The Android Open Source Project
#
LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
+include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_MODULE := pm
+LOCAL_MODULE := pmlib
+LOCAL_MODULE_STEM := pm
include $(BUILD_JAVA_LIBRARY)
-
include $(CLEAR_VARS)
-ALL_PREBUILT += $(TARGET_OUT)/bin/pm
-$(TARGET_OUT)/bin/pm : $(LOCAL_PATH)/pm | $(ACP)
- $(transform-prebuilt-to-target)
-
+LOCAL_MODULE := pm
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_SRC_FILES := pm
+LOCAL_REQUIRED_MODULES := pmlib
+include $(BUILD_PREBUILT)
diff --git a/cmds/requestsync/src/com/android/commands/requestsync/RequestSync.java b/cmds/requestsync/src/com/android/commands/requestsync/RequestSync.java
index 808618f28666..50ee56455b48 100644
--- a/cmds/requestsync/src/com/android/commands/requestsync/RequestSync.java
+++ b/cmds/requestsync/src/com/android/commands/requestsync/RequestSync.java
@@ -128,15 +128,15 @@ public class RequestSync {
} else if (opt.equals("--el") || opt.equals("--extra-long")) {
final String key = nextArgRequired();
final String value = nextArgRequired();
- mExtras.putLong(key, Long.valueOf(value));
+ mExtras.putLong(key, Long.parseLong(value));
} else if (opt.equals("--ef") || opt.equals("--extra-float")) {
final String key = nextArgRequired();
final String value = nextArgRequired();
- mExtras.putFloat(key, Long.valueOf(value));
+ mExtras.putFloat(key, Long.parseLong(value));
} else if (opt.equals("--ed") || opt.equals("--extra-double")) {
final String key = nextArgRequired();
final String value = nextArgRequired();
- mExtras.putFloat(key, Long.valueOf(value));
+ mExtras.putFloat(key, Long.parseLong(value));
} else if (opt.equals("--ez") || opt.equals("--extra-bool")) {
final String key = nextArgRequired();
final String value = nextArgRequired();
diff --git a/cmds/svc/Android.mk b/cmds/svc/Android.mk
index 198efb2d6d14..a4824c70f979 100644
--- a/cmds/svc/Android.mk
+++ b/cmds/svc/Android.mk
@@ -1,15 +1,16 @@
# Copyright 2007 The Android Open Source Project
#
LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
+include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_MODULE := svc
+LOCAL_MODULE := svclib
+LOCAL_MODULE_STEM := svc
include $(BUILD_JAVA_LIBRARY)
-
include $(CLEAR_VARS)
-ALL_PREBUILT += $(TARGET_OUT)/bin/svc
-$(TARGET_OUT)/bin/svc : $(LOCAL_PATH)/svc | $(ACP)
- $(transform-prebuilt-to-target)
-
+LOCAL_MODULE := svc
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_SRC_FILES := svc
+LOCAL_REQUIRED_MODULES := svclib
+include $(BUILD_PREBUILT)
diff --git a/cmds/uiautomator/library/Android.mk b/cmds/uiautomator/library/Android.mk
index ea77fbc69662..d65b0833aafa 100644
--- a/cmds/uiautomator/library/Android.mk
+++ b/cmds/uiautomator/library/Android.mk
@@ -116,11 +116,11 @@ $(eval $(call check-api, \
.PHONY: update-uiautomator-api
update-uiautomator-api: PRIVATE_API_DIR := $(uiautomator_api_dir)
update-uiautomator-api: PRIVATE_REMOVED_API_FILE := $(uiautomator_internal_removed_api_file)
-update-uiautomator-api: $(uiautomator_internal_api_file) | $(ACP)
+update-uiautomator-api: $(uiautomator_internal_api_file)
@echo Copying uiautomator current.txt
- $(hide) $(ACP) $< $(PRIVATE_API_DIR)/current.txt
+ $(hide) cp $< $(PRIVATE_API_DIR)/current.txt
@echo Copying uiautomator removed.txt
- $(hide) $(ACP) $(PRIVATE_REMOVED_API_FILE) $(PRIVATE_API_DIR)/removed.txt
+ $(hide) cp $(PRIVATE_REMOVED_API_FILE) $(PRIVATE_API_DIR)/removed.txt
###############################################
# clean up temp vars
uiautomator.core_src_files :=
generated by cgit v1.2.3-59-g8ed1b (git 2.39.0) at 2025-12-10 17:59:05 +0000